[MediaWiki-commits] [Gerrit] operations...tools-webservice[master]: Revert "Route all logs to /dev/null"

2016-11-15 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: Revert "Route all logs to /dev/null"
..


Revert "Route all logs to /dev/null"

Back to normalcy
This reverts commit 44a6b94831216d49c0075d1351631ee9a85f64b3.

Change-Id: I82b72a9c1c231fe990f7afe62e2d2ed5afe870b7
---
M debian/changelog
M toollabs/webservice/backends/gridenginebackend.py
M toollabs/webservice/services/lighttpdwebservice.py
M toollabs/webservice/services/pythonwebservice.py
M toollabs/webservice/services/uwsgiwebservice.py
5 files changed, 13 insertions(+), 7 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index e7c6399..3c53316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs-webservice (0.30) trusty; urgency=medium
+
+  * Stop routing logs to /dev/null
+
+ -- yuvipanda   Tue, 15 Nov 2016 17:27:09 +
+
 toollabs-webservice (0.29) trusty; urgency=medium
 
   * Route python2 webservices to /dev/null too
diff --git a/toollabs/webservice/backends/gridenginebackend.py 
b/toollabs/webservice/backends/gridenginebackend.py
index 8465bb2..6423991 100644
--- a/toollabs/webservice/backends/gridenginebackend.py
+++ b/toollabs/webservice/backends/gridenginebackend.py
@@ -69,8 +69,8 @@
 if self.extra_args:
 cmd += " --extra_args '%s'" % self.extra_args
 command = ['qsub',
-   '-e', '/dev/null',
-   '-o', '/dev/null',
+   '-e', os.path.expanduser('~/error.log'),
+   '-o', os.path.expanduser('~/error.log'),
'-i', '/dev/null',
'-q', self.queue,
'-l', 'h_vmem=%s,release=%s' % (self.memlimit, 
self.release),
diff --git a/toollabs/webservice/services/lighttpdwebservice.py 
b/toollabs/webservice/services/lighttpdwebservice.py
index 9ecf056..a3c0c42 100644
--- a/toollabs/webservice/services/lighttpdwebservice.py
+++ b/toollabs/webservice/services/lighttpdwebservice.py
@@ -22,8 +22,8 @@
 server.core-files = "disable"
 server.document-root = "{home}/public_html"
 server.pid-file = "/var/run/lighttpd/{toolname}.pid"
-server.errorlog = "/dev/null"
-server.breakagelog = "/dev/null"
+server.errorlog = "{home}/error.log"
+server.breakagelog = "{home}/error.log"
 server.follow-symlink = "enable"
 server.max-connections = 300
 server.stat-cache-engine = "simple"
@@ -39,7 +39,7 @@
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
 accesslog.use-syslog = "disable"
-accesslog.filename = "/dev/null"
+accesslog.filename = "{home}/access.log"
 
 include_shell "/usr/share/lighttpd/create-mime.assign.pl"
 
diff --git a/toollabs/webservice/services/pythonwebservice.py 
b/toollabs/webservice/services/pythonwebservice.py
index 34e4d5c..a55dcfd 100644
--- a/toollabs/webservice/services/pythonwebservice.py
+++ b/toollabs/webservice/services/pythonwebservice.py
@@ -21,7 +21,7 @@
 '--plugin', 'python,python3',  # Will ignore plugins that don't 
load
 '--http-socket', ':' + str(port),
 '--chdir', self.tool.get_homedir_subpath('www/python/src'),
-'--logto', '/dev/null',
+'--logto', self.tool.get_homedir_subpath('uwsgi.log'),
 '--callable', 'app',
 '--manage-script-name',
 '--workers', '4',
diff --git a/toollabs/webservice/services/uwsgiwebservice.py 
b/toollabs/webservice/services/uwsgiwebservice.py
index 27a1468..6a021e0 100644
--- a/toollabs/webservice/services/uwsgiwebservice.py
+++ b/toollabs/webservice/services/uwsgiwebservice.py
@@ -19,7 +19,7 @@
 args = [
 '/usr/bin/uwsgi',
 '--http-socket', ':' + str(port),
-'--logto', "/dev/null",
+'--logto', self.tool.get_homedir_subpath('uwsgi.log'),
 '--ini', self.tool.get_homedir_subpath('uwsgi.ini'),
 '--workers', '4',
 '--die-on-term',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82b72a9c1c231fe990f7afe62e2d2ed5afe870b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations...tools-webservice[master]: Revert "Route all logs to /dev/null"

2016-11-15 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: Revert "Route all logs to /dev/null"
..

Revert "Route all logs to /dev/null"

Back to normalcy
This reverts commit 44a6b94831216d49c0075d1351631ee9a85f64b3.

Change-Id: I82b72a9c1c231fe990f7afe62e2d2ed5afe870b7
---
M debian/changelog
M toollabs/webservice/backends/gridenginebackend.py
M toollabs/webservice/services/lighttpdwebservice.py
M toollabs/webservice/services/pythonwebservice.py
M toollabs/webservice/services/uwsgiwebservice.py
5 files changed, 13 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice 
refs/changes/28/321828/1

diff --git a/debian/changelog b/debian/changelog
index e7c6399..3c53316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs-webservice (0.30) trusty; urgency=medium
+
+  * Stop routing logs to /dev/null
+
+ -- yuvipanda   Tue, 15 Nov 2016 17:27:09 +
+
 toollabs-webservice (0.29) trusty; urgency=medium
 
   * Route python2 webservices to /dev/null too
diff --git a/toollabs/webservice/backends/gridenginebackend.py 
b/toollabs/webservice/backends/gridenginebackend.py
index 8465bb2..6423991 100644
--- a/toollabs/webservice/backends/gridenginebackend.py
+++ b/toollabs/webservice/backends/gridenginebackend.py
@@ -69,8 +69,8 @@
 if self.extra_args:
 cmd += " --extra_args '%s'" % self.extra_args
 command = ['qsub',
-   '-e', '/dev/null',
-   '-o', '/dev/null',
+   '-e', os.path.expanduser('~/error.log'),
+   '-o', os.path.expanduser('~/error.log'),
'-i', '/dev/null',
'-q', self.queue,
'-l', 'h_vmem=%s,release=%s' % (self.memlimit, 
self.release),
diff --git a/toollabs/webservice/services/lighttpdwebservice.py 
b/toollabs/webservice/services/lighttpdwebservice.py
index 9ecf056..a3c0c42 100644
--- a/toollabs/webservice/services/lighttpdwebservice.py
+++ b/toollabs/webservice/services/lighttpdwebservice.py
@@ -22,8 +22,8 @@
 server.core-files = "disable"
 server.document-root = "{home}/public_html"
 server.pid-file = "/var/run/lighttpd/{toolname}.pid"
-server.errorlog = "/dev/null"
-server.breakagelog = "/dev/null"
+server.errorlog = "{home}/error.log"
+server.breakagelog = "{home}/error.log"
 server.follow-symlink = "enable"
 server.max-connections = 300
 server.stat-cache-engine = "simple"
@@ -39,7 +39,7 @@
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
 accesslog.use-syslog = "disable"
-accesslog.filename = "/dev/null"
+accesslog.filename = "{home}/access.log"
 
 include_shell "/usr/share/lighttpd/create-mime.assign.pl"
 
diff --git a/toollabs/webservice/services/pythonwebservice.py 
b/toollabs/webservice/services/pythonwebservice.py
index 34e4d5c..a55dcfd 100644
--- a/toollabs/webservice/services/pythonwebservice.py
+++ b/toollabs/webservice/services/pythonwebservice.py
@@ -21,7 +21,7 @@
 '--plugin', 'python,python3',  # Will ignore plugins that don't 
load
 '--http-socket', ':' + str(port),
 '--chdir', self.tool.get_homedir_subpath('www/python/src'),
-'--logto', '/dev/null',
+'--logto', self.tool.get_homedir_subpath('uwsgi.log'),
 '--callable', 'app',
 '--manage-script-name',
 '--workers', '4',
diff --git a/toollabs/webservice/services/uwsgiwebservice.py 
b/toollabs/webservice/services/uwsgiwebservice.py
index 27a1468..6a021e0 100644
--- a/toollabs/webservice/services/uwsgiwebservice.py
+++ b/toollabs/webservice/services/uwsgiwebservice.py
@@ -19,7 +19,7 @@
 args = [
 '/usr/bin/uwsgi',
 '--http-socket', ':' + str(port),
-'--logto', "/dev/null",
+'--logto', self.tool.get_homedir_subpath('uwsgi.log'),
 '--ini', self.tool.get_homedir_subpath('uwsgi.ini'),
 '--workers', '4',
 '--die-on-term',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82b72a9c1c231fe990f7afe62e2d2ed5afe870b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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