[MediaWiki-commits] [Gerrit] Emergency fixes - change (labs...grrrit)
jenkins-bot has submitted this change and it was merged.
Change subject: Emergency fixes
..
Emergency fixes
- remove #wmt which cannot be joined without invite
- fix username check on join to check for actual username instead of
config username
- add moar logging so we can see what's going on in connecting to gerrit
Change-Id: Ifdca6b7cf606dc4d877a757fb42f7ff2d13c679e
---
M config.yaml
M src/relay.js
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config.yaml b/config.yaml
index e1cd412..b1b6042 100644
--- a/config.yaml
+++ b/config.yaml
@@ -170,9 +170,6 @@
"mediawiki/extensions/Campaigns",
"mediawiki/extensions/EducationProgram"
}
-"#wmt": {
-"labs/tools/WMT"
-}
"#brickimedia": {
"mediawiki/extensions/MediaWikiChat"
}
diff --git a/src/relay.js b/src/relay.js
index 4aa3adc..6a9c629 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -33,6 +33,7 @@
function subscribeToGerritStream(host, port, username, keypath, listener) {
var conn = ssh2.Client();
+logging.info('Connecting to gerrit..');
conn.connect({
host: host,
port: port,
@@ -40,12 +41,13 @@
privateKey: require('fs').readFileSync(keypath),
});
conn.on('ready', function() {
+logging.info('Connected; requesting stream-events');
conn.exec('gerrit stream-events', function(err, stream) {
if (err) {
logging.error(err);
throw err;
}
-
+logging.info('Connected to event stream!');
stream.on('data', function(data) {
listener(err, JSON.parse(data));
});
@@ -104,7 +106,8 @@
var joinedChannels = [];
function waitForChannelJoins(channel, nick, message) {
-if(nick === config.nick) {
+logging.info(nick + " joined " + channel);
+if(nick === ircClient.nick) {
joinedChannels.push(channel);
logging.info("Joined channel " + channel);
}
--
To view, visit https://gerrit.wikimedia.org/r/200351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdca6b7cf606dc4d877a757fb42f7ff2d13c679e
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Gerrit Patch Uploader
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Pywikipedia Conversion Bot
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Emergency fixes - change (labs...grrrit)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200351
Change subject: Emergency fixes
..
Emergency fixes
- remove #wmt which cannot be joined without invite
- fix username check on join to check for actual username instead of
config username
- add moar logging so we can see what's going on in connecting to gerrit
Change-Id: Ifdca6b7cf606dc4d877a757fb42f7ff2d13c679e
---
M config.yaml
M src/relay.js
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit
refs/changes/51/200351/1
diff --git a/config.yaml b/config.yaml
index e1cd412..b1b6042 100644
--- a/config.yaml
+++ b/config.yaml
@@ -170,9 +170,6 @@
"mediawiki/extensions/Campaigns",
"mediawiki/extensions/EducationProgram"
}
-"#wmt": {
-"labs/tools/WMT"
-}
"#brickimedia": {
"mediawiki/extensions/MediaWikiChat"
}
diff --git a/src/relay.js b/src/relay.js
index 4aa3adc..6a9c629 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -33,6 +33,7 @@
function subscribeToGerritStream(host, port, username, keypath, listener) {
var conn = ssh2.Client();
+logging.info('Connecting to gerrit..');
conn.connect({
host: host,
port: port,
@@ -40,12 +41,13 @@
privateKey: require('fs').readFileSync(keypath),
});
conn.on('ready', function() {
+logging.info('Connected; requesting stream-events');
conn.exec('gerrit stream-events', function(err, stream) {
if (err) {
logging.error(err);
throw err;
}
-
+logging.info('Connected to event stream!');
stream.on('data', function(data) {
listener(err, JSON.parse(data));
});
@@ -104,7 +106,8 @@
var joinedChannels = [];
function waitForChannelJoins(channel, nick, message) {
-if(nick === config.nick) {
+logging.info(nick + " joined " + channel);
+if(nick === ircClient.nick) {
joinedChannels.push(channel);
logging.info("Joined channel " + channel);
}
--
To view, visit https://gerrit.wikimedia.org/r/200351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdca6b7cf606dc4d877a757fb42f7ff2d13c679e
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Pywikipedia Conversion Bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
