[Erp5-report] r42226 nicolas - /erp5/trunk/utils/cloudooo/cloudooo/paster_application.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Jan 11 18:19:30 2011
New Revision: 42226

URL: http://svn.erp5.org?rev=42226&view=rev
Log:
Reads from configuration file environment variables.


Modified:
    erp5/trunk/utils/cloudooo/cloudooo/paster_application.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/paster_application.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/paster_application.py?rev=42226&r1=42225&r2=42226&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/paster_application.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/paster_application.py [utf8] Tue Jan 11 18:19:30 2011
@@ -29,6 +29,7 @@
 import gc
 from signal import signal, SIGHUP
 from os import path, mkdir
+import os
 
 import cloudooo.handler.ooo.monitor as monitor
 from cloudooo.handler.ooo.application.openoffice import openoffice
@@ -62,6 +63,18 @@ def application(global_config, **local_c
   uno_path -- Full path to pyuno library.
       e.g uno_path='/opt/openoffice.org/program'
   """
+  prefix = 'env-'
+  environment_dict = {}
+  for parameter_name, value in local_config.iteritems():
+    if value and parameter_name[:len(prefix)] == prefix:
+      variable_name = parameter_name[len(prefix):].upper()
+      if variable_name == 'PATH':
+        # merge only for PATH
+        current_value = os.environ.get(variable_name, '')
+        if current_value:
+          value = current_value + ':' + value
+      environment_dict[variable_name] = value
+
   gc.enable()
   debug_mode = convertStringToBool(local_config.get('debug_mode'))
   configureLogger(debug_mode=debug_mode)
@@ -94,6 +107,7 @@ def application(global_config, **local_c
                           local_config.get('uno_path'),
                           local_config.get('openoffice_user_interface_language',
                                            'en'),
+                          environment_dict=environment_dict,
                           )
   openoffice.start()