Fix logger and event manager

Author: Inbal Tako

securenative/event_manager.py

@@ -1,5 +1,6 @@
 import copy
 import json
+import sched
 import threading
 import time
 
@@ -31,14 +32,15 @@ def __init__(self, options=SecureNativeOptions(), http_client=None):
         self.send_enabled = False
         self.attempt = 0
         self.coefficients = [1, 1, 2, 3, 5, 8, 13]
+        self.scheduler = None
 
         if self.options.auto_send and not self.options.disable:
             interval_seconds = max(options.interval // 1000, 1)
             threading.Timer(interval_seconds, self.flush).start()
 
     def send_async(self, event, resource_path):
         if self.options.disable:
-            Logger.warn("SDK is disabled. no operation will be performed")
+            Logger.warning("SDK is disabled. no operation will be performed")
             return
 
         item = QueueItem(
@@ -60,7 +62,7 @@ def flush(self):
 
     def send_sync(self, event, resource_path, retry):
         if self.options.disable:
-            Logger.warn("SDK is disabled. no operation will be performed")
+            Logger.warning("SDK is disabled. no operation will be performed")
             return
 
         Logger.debug("Attempting to send event {}".format(event.as_dict()))
@@ -113,13 +115,21 @@ def start_event_persist(self):
         Logger.debug("Starting automatic event persistence")
         if self.options.auto_send or self.send_enabled:
             self.send_enabled = True
-            #  TODO add scheduler
+            try:
+                self.scheduler = sched.scheduler(time.time, time.sleep)
+                self.scheduler.enter(self.options.interval, 1, self._send_events)
+                self.scheduler.run()
+            except Exception:
+                pass
         else:
             Logger.debug("Automatic event persistence is disabled, you should persist events manually")
 
     def stop_event_persist(self):
         if self.send_enabled:
             Logger.debug("Attempting to stop automatic event persistence")
-            #  TODO shut down scheduler
+            try:
+                self.scheduler.cancel(self._send_events)
+            except ValueError:
+                pass
 
             Logger.debug("Stopped event persistence")

securenative/logger.py

@@ -1,24 +1,25 @@
 import logging
 
 
-class Logger(object):  # TODO!
+class Logger(object):
+    logger = logging.getLogger()
 
     @staticmethod
     def init_logger(level):
-        pass
+        logging.basicConfig(level=level, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 
     @staticmethod
     def info(msg):
-        logging.info(msg)
+        Logger.logger.info(msg)
 
     @staticmethod
     def debug(msg):
-        pass
+        Logger.logger.debug(msg)
 
     @staticmethod
-    def warn(msg):
-        pass
+    def warning(msg):
+        Logger.logger.warning(msg)
 
     @staticmethod
     def error(msg):
-        pass
+        Logger.logger.error(msg)

setup.py

@@ -21,6 +21,7 @@
     install_requires=[
         "requests",
         "pycrypro",
+        "crypto",
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',