extra comma stopped scheduler server from being detected

awspider/servers2/base.py

@@ -69,7 +69,7 @@ def __init__(self,
             self.aws_access_key_id, 
             self.aws_secret_access_key, 
             rq=self.rq)
-        self.scheduler_server_group=scheduler_server_group,
+        self.scheduler_server_group=scheduler_server_group
         self.pg = PageGetter(
             self.s3, 
             self.aws_s3_http_cache_bucket, 
@@ -221,6 +221,7 @@ def setSchedulerServer(self):
                 if scheduler_hostnames:
                     self.scheduler_server = scheduler_hostnames[0]
             if not self.scheduler_server:
+                LOGGER.error('No scheduler server found, using 0.0.0.0')
                 self.scheduler_server = "0.0.0.0"
             LOGGER.debug('Scheduler Server found at %s' % self.scheduler_server)
         except Exception, e:

awspider/servers2/interface.py

@@ -23,6 +23,7 @@ def __init__(self,
             aws_secret_access_key, 
             aws_s3_http_cache_bucket=None,
             aws_s3_storage_bucket=None,
+            remote_scheduler=True,
             scheduler_server_group='flavors_spider_production',
             schedulerserver_port=5004,
             max_simultaneous_requests=50,
@@ -36,6 +37,7 @@ def __init__(self,
         self.aws_secret_access_key=aws_secret_access_key
         self.scheduler_server_group=scheduler_server_group
         self.schedulerserver_port=schedulerserver_port
+        self.remote_scheduler=remote_scheduler
         resource = Resource()
         interface_resource = InterfaceResource(self)
         resource.putChild("interface", interface_resource)
@@ -135,7 +137,7 @@ def createReservation(self, function_name, **kwargs):
         return d
 
     def _createReservationCallback(self, data, function_name, uuid):
-        if self.scheduler_server:
+        if self.remote_scheduler:
             parameters = {
                 'uuid': uuid,
                 'type': function_name
@@ -148,8 +150,7 @@ def _createReservationCallback(self, data, function_name, uuid):
             d.addErrback(self._createReservationErrback, function_name, uuid)
             return d
         else:
-            LOGGER.error('No scheduler server defined...')
-            raise
+            self._createReservationCallback2(data, function_name, uuid, data)
 
     def _createReservationCallback2(self, data, function_name, uuid, reservation_data):
         LOGGER.debug("Function %s returned successfully." % (function_name))

setup.py

@@ -4,7 +4,7 @@
 
     name = "AWSpider",
 
-    version = "0.3.2.10",
+    version = "0.3.2.11",
 
     packages = find_packages(),