jenkins-bot has submitted this change and it was merged.

Change subject: Use hhvm.log.file in addition to error_log
......................................................................


Use hhvm.log.file in addition to error_log

Latter seems to be ignored by hhvm itself.

Also set development hhvm to use different admin server port.

Change-Id: Ia7718a996103e5b0a80cc867216f1e37bf99d0ec
---
M puppet/modules/hhvm/files/development.ini
M puppet/modules/hhvm/files/server.ini
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/hhvm/files/development.ini 
b/puppet/modules/hhvm/files/development.ini
index 5a70190..4c29ef6 100644
--- a/puppet/modules/hhvm/files/development.ini
+++ b/puppet/modules/hhvm/files/development.ini
@@ -6,6 +6,7 @@
 display_errors = 1
 memory_limit = 200M
 max_execution_time = 10s
+hhvm.log.file = /www/dev.translatewiki.net/logs/error_php
 error_log = /www/dev.translatewiki.net/logs/error_php
 
 ; hhvm specific
@@ -15,7 +16,7 @@
 hhvm.server.gzip_compression_level = 0
 hhvm.server.graceful_shutdown_wait = 5
 hhvm.server.stat_cache = 1
-hhvm.admin_server.port = 9001
+hhvm.admin_server.port = 9002
 
 hhvm.repo.central.path = /run/hhvm/development.hhbc
 
diff --git a/puppet/modules/hhvm/files/server.ini 
b/puppet/modules/hhvm/files/server.ini
index 3067181..b330793 100644
--- a/puppet/modules/hhvm/files/server.ini
+++ b/puppet/modules/hhvm/files/server.ini
@@ -5,6 +5,7 @@
 display_errors = 0
 memory_limit = 200M
 max_execution_time = 10s
+hhvm.log.file = /www/translatewiki.net/logs/error_php
 error_log = /www/translatewiki.net/logs/error_php
 
 ; hhvm specific

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7718a996103e5b0a80cc867216f1e37bf99d0ec
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to