Alon Bar-Lev has uploaded a new change for review.

Change subject: novnc: log file is actually trace file
......................................................................

novnc: log file is actually trace file

disable per default, do not have default for name

Change-Id: I2c0f9568b911d9985b9375baf5dac648ab211ea7
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M packaging/conf/ovirt-websocket-proxy.conf.defaults.in
M packaging/services/ovirt-websocket-proxy.py
2 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/15383/1

diff --git a/packaging/conf/ovirt-websocket-proxy.conf.defaults.in 
b/packaging/conf/ovirt-websocket-proxy.conf.defaults.in
index 71c66ee..61abb45 100644
--- a/packaging/conf/ovirt-websocket-proxy.conf.defaults.in
+++ b/packaging/conf/ovirt-websocket-proxy.conf.defaults.in
@@ -9,6 +9,6 @@
 FORCE_DATA_VERIFICATION=False
 CERT_FOR_DATA_VERIFICATION=
 SSL_ONLY=False
-LOG_FILE="@ENGINE_LOG@/ovirt-websocket-proxy.log"
-LOG_VERBOSE=False
+TRACE_ENABLE=False
+TRACE_FILE=
 ENGINE_USR="@ENGINE_USR@"
diff --git a/packaging/services/ovirt-websocket-proxy.py 
b/packaging/services/ovirt-websocket-proxy.py
index 4cc4f1c..e491f2c 100755
--- a/packaging/services/ovirt-websocket-proxy.py
+++ b/packaging/services/ovirt-websocket-proxy.py
@@ -156,10 +156,6 @@
         )
 
     def daemonContext(self):
-        record = self._config.get('LOG_FILE')
-        if record == 'False':
-            record = False # translate to boolean
-
         #
         # WORKAROUND-BEGIN
         # set terminate exception as
@@ -191,7 +187,10 @@
                 key=self._config.get('SSL_KEY'),
                 ssl_only=self._config.getboolean('SSL_ONLY'),
                 daemon=False,
-                record=record,
+                record=(
+                    None if not self._config.getboolean('TRACE_ENABLE')
+                    else self._config.get('TRACE_FILE')
+                ),
                 web=None,
                 target_host='ignore',
                 target_port='ignore',


--
To view, visit http://gerrit.ovirt.org/15383
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c0f9568b911d9985b9375baf5dac648ab211ea7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to