jenkins-bot has submitted this change and it was merged.
Change subject: Define config.db_port as local port for mysql server
......................................................................
Define config.db_port as local port for mysql server
Define config.db_port to specify local port for a mysql server.
This allows to run SQL queries on Tool Labs Database from local
computer setting up a SSH tunnel.
(note: SSH tunnel shall be open separately; it is not open by
pywikibot.)
Change-Id: I451a8ed338445b38806b20d3eaed63afc3b5de09
---
M pywikibot/config2.py
M pywikibot/pagegenerators.py
2 files changed, 13 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 7fc9d7a..4d065a8 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -658,6 +658,9 @@
db_password = ''
db_name_format = '{0}'
db_connect_file = user_home_path('.my.cnf')
+# local port for mysql server
+# ssh -L 4711:enwiki.labsdb:3306 user(a)tools-login.wmflabs.org
+db_port = 3306
# ############# SEARCH ENGINE SETTINGS ##############
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 2f80a3b..4633b5c 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -2408,12 +2408,18 @@
import MySQLdb as mysqldb
if site is None:
site = pywikibot.Site()
+
if config.db_connect_file is None:
- conn = mysqldb.connect(config.db_hostname,
db=config.db_name_format.format(site.dbName()),
- user=config.db_username, passwd=config.db_password)
+ conn = mysqldb.connect(config.db_hostname,
+ db=config.db_name_format.format(site.dbName()),
+ user=config.db_username,
+ passwd=config.db_password,
+ port=config.db_port)
else:
- conn = mysqldb.connect(config.db_hostname,
db=config.db_name_format.format(site.dbName()),
- read_default_file=config.db_connect_file)
+ conn = mysqldb.connect(config.db_hostname,
+ db=config.db_name_format.format(site.dbName()),
+ read_default_file=config.db_connect_file,
+ port=config.db_port)
cursor = conn.cursor()
pywikibot.output(u'Executing query:\n%s' % query)
--
To view, visit
https://gerrit.wikimedia.org/r/275159
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I451a8ed338445b38806b20d3eaed63afc3b5de09
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>