Changeset 6877

Timestamp:

22/05/10 23:07:20 (11 years ago)

Author:

astephen

Message:

added more work on getting async jobs running

Location:

cows_wps/trunk

Files:

• cows_wps/routing.py (modified) (1 diff)
• cows_wps/utils/parse_wps_config.py (modified) (1 diff)
• cows_wps/websetup.py (modified) (1 diff)
• cows_wps/wsgiapp.py (modified) (2 diffs)
• process_configs/GetWeatherStations.ini (modified) (1 diff)
• process_modules/get_weather_stations.py (modified) (1 diff)

cows_wps/trunk/cows_wps/routing.py

@@ -15 +15 @@
     # CUSTOM ROUTES HERE
     map.connect('status/:requestId', controller='status')
-    map.connect('dl/:jobId/:fileName', controller='download')
+    map.connect('dl/:authorisedRoles/:jobId/:fileName', controller='download')
     map.connect('user/:userId', controller='user', fullDetails=False)
     map.connect('user/:userId/full', controller='user', fullDetails=True)

cows_wps/trunk/cows_wps/utils/parse_wps_config.py

@@ -20 +20 @@
         if pylons.config is None:
             raise RuntimeError("Trying to access WPS configuration options before the pylons configuration is initialised")
-        
+      
         try:
             val = pylons.config['app_conf']['wps.%s' % key]

cows_wps/trunk/cows_wps/websetup.py

@@ -21 +21 @@
     """Place any commands to setup foo here"""
     conf = appconfig('config:' + filename)
-    load_environment(conf.global_conf, conf.local_conf)
+    load_environment(conf.global_conf, conf.local_conf, set_env = False)
 
     from cows_wps.model.session import engine

cows_wps/trunk/cows_wps/wsgiapp.py

@@ -20 +20 @@
 from cows_wps.utils.setenv import setenv_wps
 
-def load_environment(global_conf, app_conf):
-    """Configure the Pylons environment via the ``pylons.config``
-    object
+def load_environment(global_conf, app_conf, set_env = True):
+    """
+    Configure the Pylons environment via the ``pylons.config`` object.
     """
     # Pylons paths
@@ -44 +44 @@
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
-    setenv_wps()
+    if set_env == True:
+        setenv_wps()
 
 

cows_wps/trunk/process_configs/GetWeatherStations.ini

@@ -1 +1 @@
 [wps_interface]
 process_callable = process_modules.get_weather_stations#GetWeatherStations
-process_type = sync
+process_type = async_s
 dry_run_enabled = False
 internal = False

cows_wps/trunk/process_modules/get_weather_stations.py

@@ -80 +80 @@
     def dryRun(self, context):
 
-        # Not implemented for sync jobs
-        pass
+        self.fileSet = context.outputs['FileSet'] = FileSet()
+        self.fileSet.contents.append(FileSet(FLAG.DATA, "testfile.txt", 30000, "Soem file"))
+        
+        ddp_process_support.finishDryRun(context, [("meta", "data")], self.fileSet,
+                                         60, acceptedMessage='Dry run complete')
+