[Erp5-report] r18750 - /erp5/trunk/utils/oood/

[nobody at svn.erp5.org]

Author: yusei
Date: Wed Jan 16 18:36:19 2008
New Revision: 18750

URL: http://svn.erp5.org?rev=18750&view=rev
Log:
Move default tmp directory from /usr/share/oood/tmp to /var/tmp/oood.
Temporary directory should not be in /usr/.

Modified:
    erp5/trunk/utils/oood/config.py
    erp5/trunk/utils/oood/dispatcher.py
    erp5/trunk/utils/oood/oood.conf
    erp5/trunk/utils/oood/runserw.py
    erp5/trunk/utils/oood/winservice.py

Modified: erp5/trunk/utils/oood/config.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/config.py?rev=18750&r1=18749&r2=18750&view=diff
==============================================================================
--- erp5/trunk/utils/oood/config.py (original)
+++ erp5/trunk/utils/oood/config.py Wed Jan 16 18:36:19 2008
@@ -49,12 +49,14 @@
 
 oood_home = config.get('System', 'oood_home')
 run_dir   = config.get('System', 'run_dir')
+tmp_dir   = config.get('System', 'tmp_dir')
 uno_path  = config.get('System', 'uno_path')
 log_file  = config.get('System', 'log_file')
 
 if WIN:
   oood_home = oood_home.replace('\\', '/')
   run_dir = run_dir.replace('\\', '/')
+  tmp_dir = tmp_dir.replace('\\', '/')
   uno_path= uno_path.replace('\\', '/')
   log_file = log_file.replace('\\', '/')
   

Modified: erp5/trunk/utils/oood/dispatcher.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/dispatcher.py?rev=18750&r1=18749&r2=18750&view=diff
==============================================================================
--- erp5/trunk/utils/oood/dispatcher.py (original)
+++ erp5/trunk/utils/oood/dispatcher.py Wed Jan 16 18:36:19 2008
@@ -121,7 +121,7 @@
     self.counter = 0
     self.restart_count = -1
     self.offset_str=offset_str
-    self.tmp_dir_name = 'tmp%s'%offset_str
+    self.tmp_dir_name = config.tmp_dir+offset_str
     self.offset=0
     if offset_str != '':
       self.offset = int(offset_str)
@@ -448,7 +448,7 @@
     if config.debug_mode:
       return
     any = False
-    pth = os.path.join(config.oood_home, self.tmp_dir_name, os.path.basename(filename))
+    pth = os.path.join(self.tmp_dir_name, os.path.basename(filename))
     for f in glob.glob('%s/*'%self.tmp_dir_name):
       if not config.debug_mode:
         if os.path.isdir(f):
@@ -463,7 +463,7 @@
     """
       make a complete file name with path
     """
-    return os.path.join(config.oood_home, self.tmp_dir_name, fname)
+    return os.path.join(self.tmp_dir_name, fname)
 
 if __name__=='__main__':
     ser = MySerw((config.server_host, config.server_port), allow_none = True)

Modified: erp5/trunk/utils/oood/oood.conf
URL: http://svn.erp5.org/erp5/trunk/utils/oood/oood.conf?rev=18750&r1=18749&r2=18750&view=diff
==============================================================================
--- erp5/trunk/utils/oood/oood.conf (original)
+++ erp5/trunk/utils/oood/oood.conf Wed Jan 16 18:36:19 2008
@@ -35,6 +35,7 @@
 oood_home             = /usr/share/oood
 # Folder where pid files, lock files and virtual frame buffer mappings are stored
 run_dir               = /var/run/oood
+tmp_dir               = /var/tmp/oood
 # Folder where OpenOffice Uno interpreter is installed
 uno_path              = /opt/openoffice.org2.1/program
 # Complete absolute path to the log file

Modified: erp5/trunk/utils/oood/runserw.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/runserw.py?rev=18750&r1=18749&r2=18750&view=diff
==============================================================================
--- erp5/trunk/utils/oood/runserw.py (original)
+++ erp5/trunk/utils/oood/runserw.py Wed Jan 16 18:36:19 2008
@@ -268,7 +268,7 @@
     #########################################################
     import config
     # check if we have tmp dir and it is writeable
-    tmp_dir = os.path.join(config.oood_home, 'tmp'+offset_str)
+    tmp_dir = config.tmp_dir+offset_str
     if not os.access(tmp_dir, os.W_OK):
       message = 'ERROR: %s must exist and must be writeable' % tmp_dir
       Log.info(message)

Modified: erp5/trunk/utils/oood/winservice.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/winservice.py?rev=18750&r1=18749&r2=18750&view=diff
==============================================================================
--- erp5/trunk/utils/oood/winservice.py (original)
+++ erp5/trunk/utils/oood/winservice.py Wed Jan 16 18:36:19 2008
@@ -67,8 +67,8 @@
     win32event.SetEvent(self.hWaitStop)
     
   def SvcDoRun(self):
-    if not os.access(os.path.join(config.oood_home, 'tmp'), os.W_OK):
-      message = 'ERROR: A tmp subdirectory must exist and must be writeable!!!'
+    if not os.access(config.tmp_dir, os.W_OK):
+      message = 'ERROR: A oood tmp directory must exist and must be writeable!!!'
       Log.info(message)
       return
     message = "Server - Started as Windows Service"