jenkins-bot has submitted this change and it was merged.
Change subject: server.js assumes a timer
......................................................................
server.js assumes a timer
* Make this conditional.
Change-Id: I0a66024325ab80aa79c528ccff6e46e430f32e29
---
M bin/server.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/server.js b/bin/server.js
index 1aeaf48..890cc6b 100755
--- a/bin/server.js
+++ b/bin/server.js
@@ -137,7 +137,7 @@
"Cpu timeout fetching: %s;
killing worker %s.",
msg.location, pid
));
- timer.count('worker.exit.SIGKILL', '');
+ if (timer) {
timer.count('worker.exit.SIGKILL', ''); }
worker.kill("SIGKILL");
spawn();
}
@@ -156,7 +156,7 @@
if (!worker.suicide) {
var pid = worker.process.pid;
processLogger.log("warning", util.format("worker %s
died (%s), restarting.", pid, signal || code));
- timer.count('worker.exit.' + (signal || code), '');
+ if (timer) { timer.count('worker.exit.' + (signal ||
code), ''); }
spawn();
}
});
--
To view, visit https://gerrit.wikimedia.org/r/249202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a66024325ab80aa79c528ccff6e46e430f32e29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
