diff options
author | diosmosis <benaka@piwik.pro> | 2015-01-10 11:45:50 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-01-10 11:46:57 +0300 |
commit | 5e04ab1f73c1fa0753f3f6629547cab905f05efc (patch) | |
tree | 74af0f7633d436aa51be9f2ce0a253851981b769 /misc | |
parent | 531bd7d409df61247ae4fded65fa1d1db05784f4 (diff) |
Fixes #6919, do not check for host in regex group in log importer if format has no regex. Also add nginx json log to log importer system test.
Diffstat (limited to 'misc')
-rwxr-xr-x | misc/log-analytics/import_logs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index bf3515d49e..ec507a0048 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -1231,7 +1231,7 @@ class DynamicResolver(object): def check_format(self, format): if config.options.replay_tracking: pass - elif 'host' not in format.regex.groupindex and not config.options.log_hostname: + elif format.regex is not None and 'host' not in format.regex.groupindex and not config.options.log_hostname: fatal_error( "the selected log format doesn't include the hostname: you must " "specify the Piwik site ID with the --idsite argument" |