[MediaWiki-commits] [Gerrit] T115185: Graph worker exit code / signals - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/245485

Change subject: T115185: Graph worker exit code / signals
......................................................................

T115185: Graph worker exit code / signals

Change-Id: Icf2a21f84128fd134e245a1ee45ac3d318faed03
---
M api/server.js
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/85/245485/1

diff --git a/api/server.js b/api/server.js
index 61bcb78..6883ece 100755
--- a/api/server.js
+++ b/api/server.js
@@ -106,6 +106,8 @@
        processLogger.log('fatal', 'uncaught exception', err);
 });
 
+var timer = parsoidConfig.performanceTimer;
+
 if (cluster.isMaster && argv.n > 0) {
        // Master
 
@@ -135,6 +137,7 @@
                                                "Cpu timeout fetching: %s; 
killing worker %s.",
                                                msg.location, pid
                                        ));
+                                       timer.count('worker.exit.SIGKILL', '');
                                        worker.kill("SIGKILL");
                                        spawn();
                                }
@@ -153,6 +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), '');
                        spawn();
                }
        });
@@ -191,12 +195,12 @@
        });
 
        // Send heap usage statistics to Graphite at the requested sample rate
-       if (parsoidConfig.performanceTimer && 
parsoidConfig.heapUsageSampleInterval) {
+       if (timer && parsoidConfig.heapUsageSampleInterval) {
                setInterval(function() {
                        var heapUsage = process.memoryUsage();
-                       parsoidConfig.performanceTimer.timing('heap.rss', '', 
heapUsage.rss);
-                       parsoidConfig.performanceTimer.timing('heap.total', '', 
heapUsage.heapTotal);
-                       parsoidConfig.performanceTimer.timing('heap.used', '', 
heapUsage.heapUsed);
+                       timer.timing('heap.rss', '', heapUsage.rss);
+                       timer.timing('heap.total', '', heapUsage.heapTotal);
+                       timer.timing('heap.used', '', heapUsage.heapUsed);
                },  parsoidConfig.heapUsageSampleInterval);
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/245485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf2a21f84128fd134e245a1ee45ac3d318faed03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits