jenkins-bot has submitted this change and it was merged.
Change subject: Report IRC using Python and Yuvi's ircnotifier
......................................................................
Report IRC using Python and Yuvi's ircnotifier
Change-Id: I621fd38da3c2c96bff5a1a1494451c2a08e4cffc
---
M config.json.example
M fabfile.py
A log_to_irc.py
D log_to_irc.sh
4 files changed, 33 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config.json.example b/config.json.example
index b72005f..c53cfbb 100644
--- a/config.json.example
+++ b/config.json.example
@@ -5,5 +5,6 @@
"REDIS_HOST": "localhost",
"REDIS_QUEUE_NAME": "wikibugs2",
"IRC_SERVER": "irc.freenode.net",
- "IRC_NICK": "wikibugs2"
+ "IRC_NICK": "wikibugs2",
+ "IRCNOTIFIER_KEY": "..."
}
diff --git a/fabfile.py b/fabfile.py
index f9e62e6..f09ddba 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -17,7 +17,7 @@
def irclog_deploy(message):
with cd(code_dir):
- sudo('./log_to_irc.sh "{}"'.format(message))
+ sudo('./log_to_irc.py "{}"'.format(message))
@task
diff --git a/log_to_irc.py b/log_to_irc.py
new file mode 100755
index 0000000..09b1380
--- /dev/null
+++ b/log_to_irc.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+import sys
+import os
+import requests
+import subprocess
+import json
+
+config_file = os.path.join(
+ os.path.dirname(__file__),
+ 'config.json'
+)
+config = json.load(open(config_file))
+
+token = config['IRCNOTIFIER_KEY']
+message = '!log {user} {sudo_user}: Deployed {rev} {msg}'.format(
+ user=os.environ['USER'],
+ sudo_user=os.environ['SUDO_USER'],
+ rev=subprocess.check_output(["git", "rev-list", "HEAD",
+ "--max-count=1", "--format=oneline"]
+ ).decode('utf-8').strip(),
+ msg=' '.join(sys.argv[1:])
+)
+
+print(message)
+
+requests.post('http://ircnotifier-test-01/v1/send', data={
+ 'token': token,
+ 'channels': '#wikimedia-labs',
+ 'message': message
+})
diff --git a/log_to_irc.sh b/log_to_irc.sh
deleted file mode 100755
index d67be86..0000000
--- a/log_to_irc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-echo '#wikimedia-labs !log' $USER $SUDO_USER: Deployed `git rev-list HEAD
--max-count=1 --format=oneline` "$@" | nc wm-bot.eqiad.wmflabs 64834 -w0
--
To view, visit https://gerrit.wikimedia.org/r/180322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I621fd38da3c2c96bff5a1a1494451c2a08e4cffc
Gerrit-PatchSet: 5
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
