Ori.livneh has submitted this change and it was merged.
Change subject: mwprof module: update package deps & Upstart job def
......................................................................
mwprof module: update package deps & Upstart job def
* Remove libdb-dev from package dependencies; replace with libglib2.0-dev
and glib-networking.
* Update Upstart job def to invoke mwprof rather than collector. This depends
on Iad08d7524, but I'm going to cheat and start running it in production even
though it's still under review.
Change-Id: Id5192d229d1f2c43ace87a63c81d9e5279760aef
---
M modules/mwprof/manifests/init.pp
M modules/mwprof/templates/upstart/collector.conf.erb
2 files changed, 2 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mwprof/manifests/init.pp b/modules/mwprof/manifests/init.pp
index 498a098..9501363 100644
--- a/modules/mwprof/manifests/init.pp
+++ b/modules/mwprof/manifests/init.pp
@@ -13,7 +13,7 @@
deployment::target { 'mwprof': }
- package { [ 'build-essential', 'libdb-dev' ]: }
+ package { [ 'build-essential', 'libglib2.0-dev', 'glib-networking' ]: }
group { 'mwprof':
ensure => present,
diff --git a/modules/mwprof/templates/upstart/collector.conf.erb
b/modules/mwprof/templates/upstart/collector.conf.erb
index 4b95c05..6bca006 100644
--- a/modules/mwprof/templates/upstart/collector.conf.erb
+++ b/modules/mwprof/templates/upstart/collector.conf.erb
@@ -6,13 +6,9 @@
stop on runlevel [!2345] or mwprof.stop
-expect fork
-
setuid mwprof
setgid mwprof
-env COLLECTOR_PORT=<%= @collector_port %>
-chdir /run/mwprof
-exec /srv/deployment/mwprof/mwprof/collector
+exec /srv/deployment/mwprof/mwprof/mwprof --listen-port=<%= @collector_port %>
respawn
--
To view, visit https://gerrit.wikimedia.org/r/102070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5192d229d1f2c43ace87a63c81d9e5279760aef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
