Update backup time zone behavior

dogoncouch · Apr 5, 2018 · 1566cf7 · 1566cf7
1 parent 825f354
commit 1566cf7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/logdissect/core.py b/logdissect/core.py
@@ -174,7 +174,9 @@ def load_inputs(self):
                 else:
                     fullpath = os.path.abspath(str(f))
                     self.input_files.append(fullpath)
-            else: return 1
+            else:
+                print('File '+ f + ' not found')
+                return 1
 
     # Parsing modules:
     def list_parsers(self, *args):

diff --git a/logdissect/parsers/type.py b/logdissect/parsers/type.py
@@ -105,7 +105,7 @@ def parse_file(self, sourcepath):
                         entry['year'] = str(entryyear)
                     if self.tzone:
                         entry['tzone'] = self.tzone
-                    elif not 'tzone' in entry.keys():
+                    else:
                         entry['tzone'] = self.backuptzone
                     entry = logdissect.utils.get_utc_date(entry)
                 entry['raw_text'] = ourline

diff --git a/logdissect/utils.py b/logdissect/utils.py
@@ -124,8 +124,6 @@ def convert_unix_datestamp(entry):
     entry['tstamp'] = str(timestamp.strftime('%H%M%S.%f'))
     entry['numeric_date_stamp'] = entry['year'] + entry['month'] + \
             entry['day'] + entry['tstamp']
-    print(entry['year'] + entry['month'] + \
-            entry['day'] + entry['tstamp'])
 
     return entry