diff options
Diffstat (limited to 'peekaboo')
| -rw-r--r-- | peekaboo/config.py | 2 | ||||
| -rw-r--r-- | peekaboo/sample.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/peekaboo/config.py b/peekaboo/config.py index 903b565..f921846 100644 --- a/peekaboo/config.py +++ b/peekaboo/config.py @@ -79,7 +79,7 @@ class PeekabooConfig(object): # pylint: disable=too-many-instance-attributes self.interpreter = '/usr/bin/python -u' self.worker_count = 3 self.sample_base_dir = '/tmp' - self.job_hash_regex = '/var/lib/amavis/tmp/([^/]+)/parts.*' + self.job_hash_regex = '/amavis/tmp/([^/]+)/parts/' self.use_debug_module = False self.keep_mail_data = False self.db_url = 'sqlite:////var/lib/peekaboo/peekaboo.db' diff --git a/peekaboo/sample.py b/peekaboo/sample.py index c46d13c..2f5bbfb 100644 --- a/peekaboo/sample.py +++ b/peekaboo/sample.py @@ -266,7 +266,7 @@ class Sample(object): return job_hash def get_job_hash(self): - job_hash = re.sub(self.__job_hash_regex, r'\1', + job_hash = re.sub('.*%s.*' % self.__job_hash_regex, r'\1', self.__path) if job_hash == self.__path: # regex did not match. |