Jelajahi Sumber

Ignore file not found errors, but bail on others when loading ACL.

Daniel Gruno 5 tahun lalu
induk
melakukan
50ce4780ba
1 mengubah file dengan 4 tambahan dan 2 penghapusan
  1. 4 2
      pypubsub.py

+ 4 - 2
pypubsub.py

@@ -238,10 +238,11 @@ async def main():
 
 if __name__ == '__main__':
     CONF = yaml.safe_load(open('pypubsub.yaml'))
+    ACL = {}
     try:
         ACL = yaml.safe_load(open('pypubsub_acl.yaml'))
-    except:
-        ACL = {}
+    except FileNotFoundError:
+        print("No ACL configuration file found, private events will not be broadcast.")
     PAYLOADERS = [netaddr.IPNetwork(x) for x in CONF['clients']['payloaders']]
     loop = asyncio.get_event_loop()
     try:
@@ -249,3 +250,4 @@ if __name__ == '__main__':
     except KeyboardInterrupt:
         pass
     loop.close()
+