Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180322
Change subject: Report IRC using Python and Yuvi's ircnotifier
......................................................................
Report IRC using Python and Yuvi's ircnotifier
Change-Id: I621fd38da3c2c96bff5a1a1494451c2a08e4cffc
---
M fabfile.py
A log_to_irc.py
D log_to_irc.sh
3 files changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2
refs/changes/22/180322/1
diff --git a/fabfile.py b/fabfile.py
index 85a9306..50a28f3 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -16,7 +16,7 @@
def irclog_deploy(message):
with cd(code_dir):
- sudo('./log_to_irc.sh "{}"'.format(message))
+ sudo('./log_to_irc.py "{}"'.format(message))
def pull():
diff --git a/log_to_irc.py b/log_to_irc.py
new file mode 100755
index 0000000..b6dd724
--- /dev/null
+++ b/log_to_irc.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+import sys
+import os
+import requests
+import subprocess
+
+USER = os.environ['USER']
+SUDO_USER = os.environ['SUDO_USER']
+REV = subprocess.check_output(["git", "rev-list", "HEAD", "--max-count=1",
"--format=oneline"])
+MSG = ' '.join(sys.argv[1:])
+
+requests.post('http://ircnotifier-test-01/v1/send', data={
+ 'token': 'd534a9eb9e92226f1b030097828b4de7092388d8',
+ 'channels': '#wikimedia-labs',
+ 'message': '!log {USER} {SUDO_USER}: Deployed {REV}
{MSG}'.format(**locals()),
+})
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: newchange
Gerrit-Change-Id: I621fd38da3c2c96bff5a1a1494451c2a08e4cffc
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
