GH #755 - Renamed delete_after_pick_up -> delete_after_pickup. User c…

…onfig files are picked up from pickup/incoming/user-conf instead of config/repo/user-conf.

code/zato-cli/src/zato/cli/create_server.py

@@ -306,16 +306,18 @@
 topics=
 
 [user_conf]
-pickup_from=./config/repo/user-conf
+pickup_from=./pickup/incoming/user-conf
 patterns=*.conf
 parse_on_pickup=False
+delete_after_pickup=False
 services=zato.pickup.update-user-conf
 topics=
 
 [static]
 pickup_from=./pickup/incoming/static
 patterns=*
 parse_on_pickup=False
+delete_after_pickup=False
 services=zato.pickup.update-static
 topics=
 """

code/zato-server/src/zato/server/base/parallel/__init__.py

@@ -477,10 +477,10 @@ def start_server(parallel_server, zato_deployment_key=None):
         salt_size = self.sso_config.hash_secret.salt_size
         self.crypto_manager.add_hash_scheme('zato.default', self.sso_config.hash_secret.rounds, salt_size)
 
-        for name in('current_work_dir', 'backup_work_dir', 'last_backup_work_dir', 'delete_after_pick_up'):
+        for name in('current_work_dir', 'backup_work_dir', 'last_backup_work_dir', 'delete_after_pickup'):
 
             # New in 2.0
-            if name == 'delete_after_pick_up':
+            if name == 'delete_after_pickup':
                 value = asbool(self.fs_server_config.hot_deploy.get(name, True))
                 self.hot_deploy_config[name] = value
             else:
@@ -589,7 +589,7 @@ def set_up_pickup(self):
 
             stanza_config.read_on_pickup = asbool(stanza_config.get('read_on_pickup', True))
             stanza_config.parse_on_pickup = asbool(stanza_config.get('parse_on_pickup', True))
-            stanza_config.delete_after_pick_up = asbool(stanza_config.get('delete_after_pick_up', True))
+            stanza_config.delete_after_pickup = asbool(stanza_config.get('delete_after_pickup', True))
             stanza_config.case_insensitive = asbool(stanza_config.get('case_insensitive', True))
             stanza_config.pickup_from = absolutize(stanza_config.pickup_from, self.base_dir)
             stanza_config.is_service_hot_deploy = False
@@ -627,7 +627,7 @@ def set_up_pickup(self):
             'patterns': [globre.compile('*.py', globre.EXACT | IGNORECASE)],
             'read_on_pickup': False,
             'parse_on_pickup': False,
-            'delete_after_pick_up': self.hot_deploy_config.delete_after_pick_up,
+            'delete_after_pickup': self.hot_deploy_config.delete_after_pickup,
             'is_service_hot_deploy': True,
         })
 

code/zato-server/src/zato/server/pickup.py

@@ -134,8 +134,8 @@ def invoke_callbacks(self, pickup_event, services, topics):
             for topic in topics:
                 spawn_greenlet(self.server.publish_pickup, topic, request)
 
-        except Exception, e:
-            logger.warn(format_exc(e))
+        except Exception:
+            logger.warn(format_exc())
 
 # ################################################################################################################################
 
@@ -145,7 +145,7 @@ def post_handle(self, full_path, config):
         if config.move_processed_to:
             shutil_copy(full_path, config.move_processed_to)
 
-        if config.delete_after_pick_up:
+        if config.delete_after_pickup:
             os.remove(full_path)
 
 # ################################################################################################################################
@@ -170,6 +170,7 @@ def run(self):
                         try:
 
                             pe.base_dir = self.wd_to_path[event.wd]
+
                             config = self.callback_config[pe.base_dir]
 
                             if not self.should_pick_up(event.name, config.patterns):
@@ -181,7 +182,7 @@ def run(self):
 
                             # If we are deploying services, the path is different than for other resources
                             if config.is_service_hot_deploy:
-                                spawn_greenlet(hot_deploy, self.server, pe.file_name, pe.full_path, config.delete_after_pick_up)
+                                spawn_greenlet(hot_deploy, self.server, pe.file_name, pe.full_path, config.delete_after_pickup)
                                 continue
 
                             if config.read_on_pickup:
@@ -205,11 +206,11 @@ def run(self):
                             spawn_greenlet(self.invoke_callbacks, pe, config.services, config.topics)
                             self.post_handle(pe.full_path, config)
 
-                        except Exception, e:
-                            logger.warn(format_exc(e))
+                        except Exception:
+                            logger.warn(format_exc())
 
                 except KeyboardInterrupt:
                     self.keep_running = False
 
-        except Exception, e:
-            logger.warn(format_exc(e))
+        except Exception:
+            logger.warn(format_exc())