added a variable called file_date_limit in sr_config.py. default value = 60 days, but can be changed in config file to anything else. (value no longer hardcoded) #366

Author: cleaaum

sarra/sr_config.py

@@ -658,7 +658,7 @@ def declare_option(self,option):
 
     def defaults(self):
         self.logger.debug("sr_config defaults")
-
+        self.file_time_limit      = 60
         self.retry_mode           = True
         self.retry_ttl            = None
 
@@ -1592,7 +1592,8 @@ def option(self,words):
 
                      self.logger.debug("Masks")
                      self.logger.debug("Masks %s"% self.masks)
-
+                elif words0 =='file_date_limit':
+                    self.file_date_limit = words1
                 elif words0 in ['accept_unmatched','accept_unmatch','au']: # See: sr_config.7
                      if (words1 is None) or words[0][0:1] == '-' : 
                         self.accept_unmatch = True

sarra/sr_poll.py

@@ -154,6 +154,7 @@ def _file_date_exceed_limit(self, date, date_limit):
                 assign appropriate year (for jan-jun -> assign prev year, for jul-dec assign current year)
             Note: is it possible for a file to be more than 6 months old and have the format Mo Day TIME ? (problematic)
         """
+        date_limit=int(date_limit)
         current_date = datetime.datetime.now()
         try:
             date_temp = datetime.datetime.strptime(date, '%d %b %H:%M')
@@ -214,8 +215,7 @@ def differ_ls_file(self, ls, lspath):
                 # this format could change depending on plugin
                 # line_mode.py format "-rwxrwxr-x 1 1000 1000 8123 24 Mar 22:54 2017-03-25-0254-CL2D-AUTO-minute-swob.xml"
                 date = str2[5] + " " + str2[6] + " " + str2[7]
-
-                if self._file_date_exceed_limit(date, 60):
+                if self._file_date_exceed_limit(date, self.file_date_limit):
                     self.logger.info("File should be processed")
                     # execute rest of code
                     # keep a newer entry
@@ -232,7 +232,7 @@ def differ_ls_file(self, ls, lspath):
                         desclst[f] = ls[f]
                         continue
                 else:
-                    self.logger.info("File should be skiped")
+                    self.logger.info("File should be skipped")
                     # ignore rest of code and re iterate
             except:
                 pass