Changeset 9d85765d385c88f113c844e88ba235403610aa1b

Timestamp:

02/09/09 17:21:36 (13 months ago)

Author:

peter <peter@…>

Children:

e7a70cf78f732f99e2669fc40972c2747bf24724

Parents:

9994aa503c7ed0c1fe6aa517f0046add88767acf

git-committer:

peter <peter@doors.(none)> / 2009-02-09T09:21:36Z-0800

Message:

Renamed any references of plyster to pydra

Files:

• pydra_server/cluster/master.py (modified) (1 diff)
• pydra_server/cluster/node.py (modified) (1 diff)
• pydra_server/cluster/task_manager.py (modified) (3 diffs)
• pydra_server/models.py (modified) (1 diff)
• pydra_server/views.py (modified) (1 diff)
• settings.py (modified) (1 diff)
• urls.py (modified) (1 diff)

pydra_server/cluster/master.py

@@ -33 +33 @@
 from django.utils import simplejson
 
-from plyster_server.models import Node, TaskInstance
-from plyster_server.cluster.constants import *
+from pydra_server.models import Node, TaskInstance
+from pydra_server.cluster.constants import *
 from task_manager import TaskManager
 

pydra_server/cluster/node.py

@@ -86 +86 @@
     def start_workers(self):
         self.pids = [
-            Popen(["python", "plyster_server/cluster/worker.py", self.master_host, str(self.master_port), self.node_key, '%s:%s' % (self.node_key, i)]).pid 
+            Popen(["python", "pydra_server/cluster/worker.py", self.master_host, str(self.master_port), self.node_key, '%s:%s' % (self.node_key, i)]).pid 
             for i in range(self.info['cores'])
             ]

pydra_server/cluster/task_manager.py

@@ -1 +1 @@
 from tasks import *
-from plyster_server.models import TaskInstance
+from pydra_server.models import TaskInstance
 
 """ TaskManager - Class that tracks and controls tasks
@@ -146 +146 @@
 
         # Step 1: get all python files in the tasks directory
-        files = os.listdir('./plyster_server/task_cache')
+        files = os.listdir('./pydra_server/task_cache')
 
         # Step 2: iterate through all the python files importing each one and 
@@ -152 +152 @@
         for filename in files:
             if filename <> '__init__.py' and filename[-3:] == '.py':
-                module = 'plyster_server.task_cache.%s' % filename[:-3]
+                module = 'pydra_server.task_cache.%s' % filename[:-3]
                 tasks = __import__(module, {}, {}, ['Task'])
 

pydra_server/models.py

@@ -15 +15 @@
 # set defaults for settings
 if not pydraSettings.host:
-    set_setting_value('plyster_server.models', '', 'host', 'localhost')
+    set_setting_value('pydra_server.models', '', 'host', 'localhost')
 if not pydraSettings.port:
-    set_setting_value('plyster_server.models', '', 'port', 18800)
+    set_setting_value('pydra_server.models', '', 'port', 18800)
 
 

pydra_server/views.py

@@ -8 +8 @@
 import math
 
-from plyster_server.models import Node, TaskInstance, pydraSettings
+from pydra_server.models import Node, TaskInstance, pydraSettings
 from cluster.amf_controller import AMFController
 from forms import NodeForm

settings.py

@@ -1 @@
-# Django settings for plyster project.
+# Django settings for pydra project.
 
 DEBUG = True

urls.py

@@ -6 +6 @@
 
 urlpatterns = patterns('',
-    # Example:
-    # (r'^plyster/', include('plyster.foo.urls')),
-
-    # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
-    # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # (r'^admin/(.*)', admin.site.root),
-
-    (r'^', include('plyster_server.urls')),
-
+    (r'^', include('pydra_server.urls')),
 )