Author: hdu
Date: Fri Jul 12 08:56:00 2013
New Revision: 1502482

URL: http://svn.apache.org/r1502482
Log:
#i120083# make python loglevel and log output changeable through environment 
vars

Set the log level with the environment variable "PYSCRIPT_LOG_LEVEL"
    "DEBUG" (for debugging)
    "ERROR" (show errors only)
    "NONE"  (or anything else) (for production) is the default
and the log output type with the enviroment variable "PYSCRIPT_LOG_STDOUT"
    "0" (log output to user/Scripts/python/log.txt)
    "1" (or anything else) (log output to stdout)

Patch by: Tsutomu Uchino <hanya.r...@gmail.com>
Review by: Herbert Dürr <h...@apache.org>

Modified:
    openoffice/trunk/main/scripting/source/pyprov/pythonscript.py

Modified: openoffice/trunk/main/scripting/source/pyprov/pythonscript.py
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/source/pyprov/pythonscript.py?rev=1502482&r1=1502481&r2=1502482&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/source/pyprov/pythonscript.py (original)
+++ openoffice/trunk/main/scripting/source/pyprov/pythonscript.py Fri Jul 12 
08:56:00 2013
@@ -34,16 +34,24 @@ except NameError:
     unicode = str
 
 class LogLevel:
-    NONE = 0
-    ERROR = 1
-    DEBUG = 2
+    NONE = 0   # production level
+    ERROR = 1  # for script developers
+    DEBUG = 2  # for script framework developers
+
+PYSCRIPT_LOG_ENV = "PYSCRIPT_LOG_LEVEL"
+PYSCRIPT_LOG_STDOUT_ENV = "PYSCRIPT_LOG_STDOUT"
 
 # Configuration ----------------------------------------------------
-LogLevel.use = LogLevel.NONE                # production level
-#LogLevel.use = LogLevel.ERROR               # for script developers
-#LogLevel.use = LogLevel.DEBUG               # for script framework developers
-LOG_STDOUT = True                           # True, writes to stdout 
(difficult on windows)
-                                            # False, writes to 
user/Scripts/python/log.txt
+LogLevel.use = LogLevel.NONE
+if os.environ.get(PYSCRIPT_LOG_ENV) == "ERROR":
+    LogLevel.use = LogLevel.ERROR
+elif os.environ.get(PYSCRIPT_LOG_ENV) == "DEBUG":
+    LogLevel.use = LogLevel.DEBUG
+
+# True, writes to stdout (difficult on windows)
+# False, writes to user/Scripts/python/log.txt
+LOG_STDOUT = os.environ.get(PYSCRIPT_LOG_STDOUT_ENV, "1") != "0"
+
 ENABLE_EDIT_DIALOG=False                    # offers a minimal editor for 
editing.
 #-------------------------------------------------------------------
 


Reply via email to