From 41363db9d4c1540c65ca2bccd8cfe1115a3ddbba Mon Sep 17 00:00:00 2001
From: desaster <desaster@951d7100-d841-11de-b865-b3884708a8e2>
Date: Tue, 8 Jan 2013 17:39:02 +0000
Subject: [PATCH] Add support for specifying MySQL port (issue #61)

git-svn-id: https://kippo.googlecode.com/svn/trunk@225 951d7100-d841-11de-b865-b3884708a8e2
---
 kippo.cfg.dist       | 1 +
 kippo/dblog/mysql.py | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/kippo.cfg.dist b/kippo.cfg.dist
index d4d7a482..840df2f6 100644
--- a/kippo.cfg.dist
+++ b/kippo.cfg.dist
@@ -130,6 +130,7 @@ interact_port = 5123
 #database = kippo
 #username = kippo
 #password = secret
+#port = 3306
 
 # XMPP Logging
 #
diff --git a/kippo/dblog/mysql.py b/kippo/dblog/mysql.py
index 9d6d3f94..1245387a 100644
--- a/kippo/dblog/mysql.py
+++ b/kippo/dblog/mysql.py
@@ -32,11 +32,16 @@ class ReconnectingConnectionPool(adbapi.ConnectionPool):
 
 class DBLogger(dblog.DBLogger):
     def start(self, cfg):
+        if cfg.has_option('database_mysql', 'port'):
+            port = int(cfg.get('database_mysql', 'port'))
+        else:
+            port = 3306
         self.db = ReconnectingConnectionPool('MySQLdb',
             host = cfg.get('database_mysql', 'host'),
             db = cfg.get('database_mysql', 'database'),
             user = cfg.get('database_mysql', 'username'),
             passwd = cfg.get('database_mysql', 'password'),
+            port = port,
             cp_min = 1,
             cp_max = 1)