[Greater-commits] r3688 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Modules

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 11:50:35 +0200 (Tue, 26 Jul 2011)
New Revision: 3688

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py
Log:
Merged revisions 3634 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r3634 | aheinecke | 2011-07-22 10:19:10 +0200 (Fri, 22 Jul 2011) | 3 lines
  
  Place the scheduler and worker logs into the application dir on windows
  and into the home directory on linux
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448,3577-3578,3604-3606,3611,3613-3618,3620,3623,3633
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448,3577-3578,3604-3606,3611,3613-3618,3620,3623,3633-3634

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:49:49 UTC (rev 3687)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:50:35 UTC (rev 3688)
@@ -16,6 +16,9 @@
 	* Greater/Modules/catchment.py:
 		- Do not explicitly cast stringtypes to ascii since they also
 		  can be unicode
+	* Greater/Modules/model.py:
+		- Introducing new dependency to winpaths on windows and
+		  start the schedu
 
 2011-07-25  Andre Heinecke <aheinecke at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py	2011-07-26 09:49:49 UTC (rev 3687)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py	2011-07-26 09:50:35 UTC (rev 3688)
@@ -41,6 +41,7 @@
 # Under Win32 play a system sound when the simulation finishes
 from wxPython.wx import wxPlatform
 if wxPlatform == '__WXMSW__':
+    import winpaths
     try:
         import winsound
     except:
@@ -319,14 +320,26 @@
         self.useserver = useserver
 
         wxBeginBusyCursor()
+        if wxPlatform == '__WXMSW__':
+            logdir = os.path.join(winpaths.get_appdata(), "greater")
+        else:
+            logdir = os.path.join("~", ".greater")
+
+        if not os.path.isdir(logdir):
+            os.mkdir(logdir)
+
         try:
             if self.useserver == 'yes':
                 self.rpc = xmlrpclib.Server(self.serverurl)
             else:
-                server = SchedulerProcess(port_scan_range = 500, 
-                                          allow_shutdown = 1, db_api_module = self.db_api_module)
+                server = SchedulerProcess(port_scan_range = 500,
+                                          allow_shutdown = 1,
+                                          db_api_module = self.db_api_module,
+                                          log_file = os.path.join(logdir, "scheduler.log"))
                 server.start()
-                worker = WorkerProcess(scheduler_port = server.real_worker_port, db_api_module = self.db_api_module)
+                worker = WorkerProcess(scheduler_port = server.real_worker_port,
+                                       db_api_module = self.db_api_module,
+                                       log_file = os.path.join(logdir, "worker%s.log" % "1"))
                 worker.start()
                 server.wait_for_worker()
                 self.rpc = xmlrpclib.Server('http://localhost:%d' % \