enhance import from anyware and config file

agn-7 · Jan 31, 2022 · 45c0a39 · 45c0a39
1 parent 6346b6c
commit 45c0a39
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 9 deletions.
diff --git a/snmp_collector/__main__.py b/snmp_collector/__main__.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
-from event_loop import run
+try:
+    from event_loop import run
+except:
+    from .event_loop import run
 
 __author__ = 'aGn'
 __copyright__ = "Copyright 2018, Planet Earth"

diff --git a/snmp_collector/collect/collector.py b/snmp_collector/collect/collector.py
@@ -7,7 +7,10 @@
 from pysnmp.hlapi.asyncio import *
 from colored_print import ColoredPrint
 
-from response.response import Response
+try:
+    from snmp_collector.response.response import Response
+except:
+    from response.response import Response
 
 log = ColoredPrint()
 

diff --git a/snmp_collector/event_loop.py b/snmp_collector/event_loop.py
@@ -16,10 +16,18 @@
 
 from pysnmp.error import PySnmpError
 from pysnmp.hlapi.asyncio import *
+from colored_print import ColoredPrint
 
-from read_conf.read_configuration import get_config
-from collect.collector import SNMPReader
-from utility.utility import Utility
+try:
+    from snmp_collector.read_conf.read_configuration import get_config
+    from snmp_collector.collect.collector import SNMPReader
+    from snmp_collector.utility.utility import Utility
+except:
+    from read_conf.read_configuration import get_config
+    from collect.collector import SNMPReader
+    from utility.utility import Utility
+
+log = ColoredPrint()
 
 __author__ = 'aGn'
 __copyright__ = "Copyright 2018, Planet Earth"
@@ -208,7 +216,7 @@ def run_forever(self):
 
             else:
                 time.sleep(5)
-                print("Waiting for SNMP configuration ...")
+                log.info("Waiting for SNMP configuration ...")
 
 
 def run():

diff --git a/snmp_collector/read_conf/read_configuration.py b/snmp_collector/read_conf/read_configuration.py
@@ -3,8 +3,14 @@
 
 from pprint import pprint
 from pysnmp.hlapi.asyncio import *
+from colored_print import ColoredPrint
 
-from utility.utility import MWT
+try:
+    from snmp_collector.utility.utility import MWT
+except:
+    from utility.utility import MWT
+
+log = ColoredPrint()
 
 __author__ = 'aGn'
 __copyright__ = "Copyright 2018, Planet Earth"
@@ -84,6 +90,8 @@ def get_config():
             config_path = 'config.json'
         elif os.path.exists("./config/config.json"):
             config_path = './config/config.json'
+        elif os.path.exists("./snmp_collector/config/config.json"):
+            config_path = './snmp_collector/config/config.json'  
         else:
             raise ValueError("Cannot find a config file!")
 
@@ -95,7 +103,7 @@ def get_config():
             pprint(configs)
 
     except (KeyError, IOError, FileNotFoundError, Exception) as exc:
-        print(exc)
+        log.err(exc)
 
     return configs
 

diff --git a/snmp_collector/utility/utility.py b/snmp_collector/utility/utility.py
@@ -1,6 +1,10 @@
 import time
 import os
 
+from colored_print import ColoredPrint
+
+log = ColoredPrint()
+
 __author__ = 'aGn'
 __copyright__ = "Copyright 2018, Planet Earth"
 
@@ -20,14 +24,16 @@ def is_config_exist():
             config_path = os.environ['CONFIG_PATH']
         elif os.path.exists('./config/' + path):
             config_path = './config/' + path
+        elif os.path.exists('./snmp_collector/config/' + path):
+            config_path = './snmp_collector/config/' + path
         elif os.path.exists(path):
             config_path = path
         elif os.path.exists("../" + path):
             config_path = "../" + path
         elif os.path.exists("../../" + path):
             config_path = "../../" + path
         else:
-            print("Cannot find a config file!")
+            log.err("Cannot find a config file!")
 
         if config_path is not None:
             stamp = os.stat(config_path).st_mtime