From 2b2f8c54e6cc4a79f7cac96b12581c2aa4914421 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Mon, 18 May 2015 21:59:11 +0200 Subject: [PATCH] little Modul changes --- plugin_test/plugin_test.py | 12 ++++++------ plugin_test/plugins/BosMon/__init__.py | 3 +-- plugin_test/plugins/template/__init__.py | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/plugin_test/plugin_test.py b/plugin_test/plugin_test.py index 06207ad..32e8991 100755 --- a/plugin_test/plugin_test.py +++ b/plugin_test/plugin_test.py @@ -52,9 +52,9 @@ except: data = {"ric":"1234567", "function":"1", "msg":"Hello World!"} while True: - time.sleep(1) - logging.info("Alarm!") - for i in pluginloader.getPlugins(): - logging.debug("Load Plugin: " + i["name"]) - plugin = pluginloader.loadPlugin(i) - plugin.run("POC","80000000",data) \ No newline at end of file + time.sleep(1) + logging.info("Alarm!") + for i in pluginloader.getPlugins(): + plugin = pluginloader.loadPlugin(i) + logging.debug(i["name"] + " Plugin called") + plugin.run("POC","80000000",data) \ No newline at end of file diff --git a/plugin_test/plugins/BosMon/__init__.py b/plugin_test/plugins/BosMon/__init__.py index b66a4ce..4b0d124 100644 --- a/plugin_test/plugins/BosMon/__init__.py +++ b/plugin_test/plugins/BosMon/__init__.py @@ -9,8 +9,6 @@ import urllib #for the HTTP request with parameters import base64 #for the HTTP request with User/Password def run(typ,freq,data): - logging.debug("BosMon Plugin called") - logging.debug(" - typ: " +typ) try: #get BosMon-Config bosmon_server = globals.config.get("BosMon", "bosmon_server") @@ -18,6 +16,7 @@ def run(typ,freq,data): bosmon_user = globals.config.get("BosMon", "bosmon_user") bosmon_password = globals.config.get("BosMon", "bosmon_password") bosmon_channel = globals.config.get("BosMon", "bosmon_channel") + logging.debug(" - typ: " +typ) logging.debug(" - Server: " +bosmon_server) logging.debug(" - Port: " +bosmon_port) logging.debug(" - User: " +bosmon_user) diff --git a/plugin_test/plugins/template/__init__.py b/plugin_test/plugins/template/__init__.py index f9008a2..7d44380 100644 --- a/plugin_test/plugins/template/__init__.py +++ b/plugin_test/plugins/template/__init__.py @@ -5,7 +5,6 @@ import logging # Global logger import globals # Global variables def run(typ,freq,data): - logging.debug("template Plugin called") try: logging.info("ZVEI: %s wurde auf %s empfangen!", data["zvei"],freq) except: