make conf file optional

pinterest · Jan 14, 2016 · a5a1657 · a5a1657
1 parent 80ad81f
commit a5a1657
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/deploy-agent/deployd/agent.py b/deploy-agent/deployd/agent.py
@@ -340,7 +340,7 @@ def main():
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('-e', '--server_stage', dest='stage', default='prod',
                         help="This option is deprecated")
-    parser.add_argument('-f', '--config-file', dest='config_file', required=False, default='deployd/conf/agent.conf',
+    parser.add_argument('-f', '--config-file', dest='config_file', required=False,
                         help="the deploy agent config file path.")
     parser.add_argument('-d', '--daemon', dest="daemon", action='store_true')
     parser.add_argument('-n', '--host_name', dest="hostname", required=False, default=None)

diff --git a/deploy-agent/deployd/common/config.py b/deploy-agent/deployd/common/config.py
@@ -35,15 +35,19 @@ def __init__(self, filenames=None, config_reader=None):
             self._config_reader = config_reader
             return
 
+        self._config_reader = SafeConfigParser()
+        if not filenames:
+            return
+
         if not os.path.exists(filenames):
             print('Cannot find config files: {}'.format(filenames))
             exit_abruptly(1)
 
         self._filenames = filenames
-        self._config_reader = SafeConfigParser()
         loaded_filenames = self._config_reader.read(self._filenames)
         if len(loaded_filenames) == 0:
             print('Cannot read config files: {}'.format(self._filenames))
+            exit_abruptly(1)
 
     def get_config_filename(self):
         return self._filenames