From b565a31637394a73401cbf20876075619bdf8209 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Plogmann Date: Sat, 23 Dec 2017 12:35:02 +0100 Subject: [PATCH 1/3] added mysql Port to mysql connect and config --- config/config.template.ini | 1 + plugins/MySQL/MySQL.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/config.template.ini b/config/config.template.ini index bbb6e95..23cf14b 100644 --- a/config/config.template.ini +++ b/config/config.template.ini @@ -192,6 +192,7 @@ template = 0 [MySQL] # MySQL configuration dbserver = localhost +dbport = 3306 #default port: 3306 dbuser = boswatch dbpassword = root database = boswatch diff --git a/plugins/MySQL/MySQL.py b/plugins/MySQL/MySQL.py index 3d4db16..e7414df 100644 --- a/plugins/MySQL/MySQL.py +++ b/plugins/MySQL/MySQL.py @@ -91,7 +91,7 @@ def run(typ,freq,data): # Connect to MySQL # logging.debug("connect to MySQL") - connection = mysql.connector.connect(host = globalVars.config.get("MySQL","dbserver"), user = globalVars.config.get("MySQL","dbuser"), passwd = globalVars.config.get("MySQL","dbpassword"), db = globalVars.config.get("MySQL","database"), charset='utf8') + connection = mysql.connector.connect(host = globalVars.config.get("MySQL","dbserver"), host = globalVars.config.get("port","dbport"), user = globalVars.config.get("MySQL","dbuser"), passwd = globalVars.config.get("MySQL","dbpassword"), db = globalVars.config.get("MySQL","database"), charset='utf8') cursor = connection.cursor() except: logging.error("cannot connect to MySQL") From 46f7719c8972d8fd967d128724a7c3d03c141487 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Plogmann Date: Sat, 23 Dec 2017 12:37:13 +0100 Subject: [PATCH 2/3] fixed syntax --- plugins/MySQL/MySQL.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/MySQL/MySQL.py b/plugins/MySQL/MySQL.py index e7414df..69bbb22 100644 --- a/plugins/MySQL/MySQL.py +++ b/plugins/MySQL/MySQL.py @@ -91,7 +91,7 @@ def run(typ,freq,data): # Connect to MySQL # logging.debug("connect to MySQL") - connection = mysql.connector.connect(host = globalVars.config.get("MySQL","dbserver"), host = globalVars.config.get("port","dbport"), user = globalVars.config.get("MySQL","dbuser"), passwd = globalVars.config.get("MySQL","dbpassword"), db = globalVars.config.get("MySQL","database"), charset='utf8') + connection = mysql.connector.connect(host = globalVars.config.get("MySQL","dbserver"), port = globalVars.config.get("MySQL","dbport"), user = globalVars.config.get("MySQL","dbuser"), passwd = globalVars.config.get("MySQL","dbpassword"), db = globalVars.config.get("MySQL","database"), charset='utf8') cursor = connection.cursor() except: logging.error("cannot connect to MySQL") From c212eac45b6cc7656326e4b414c9d165fcc5dbd6 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 23 Dec 2017 13:24:02 +0100 Subject: [PATCH 3/3] edit CL --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfff188..c9abc23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### __[v2.3.1]__ - Unreleased ##### Added +- Config Eintrag um Port für MySQL Plugin festzulegen [#345](https://github.com/Schrolli91/BOSWatch/pull/345) ##### Changed ##### Deprecated ##### Removed