bj/syncthing-monitor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BUGFIX (attempt): folder devices are overwritten and replaced with singleton device list consisting of my device ID upon restart; added more debug messages

Browse Source
This commit is contained in:
B.J. Dweck 2021-02-03 11:00:17 +02:00
parent 10ef3a3a94
commit 37902a3bcc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
syncthing_monitor/__main__.py
View File

@ -58,16 +58,21 @@ class SyncthingMonitor:
self.my_device_id = self.syncthing.get_my_device_id() self.my_device_id = self.syncthing.get_my_device_id()
print("Found My Device ID: {0}".format(self.my_device_id), flush=True) print("Found My Device ID: {0}".format(self.my_device_id), flush=True)
print("Disabling global/local discovery/relay...", flush=True)
self.syncthing.disable_announce_discovery_and_relay() self.syncthing.disable_announce_discovery_and_relay()
self.syncthing.create_shared_folder(SHARED_FOLDER_ID, SHARED_FOLDER_LABEL, self.syncthing_data_path,
[{'id': self.my_device_id}])
self.syncthing.sync_config() self.syncthing.sync_config()
print("Registering etcd update callback...", flush=True) print("Registering etcd update callback...", flush=True)
self.etcd.register_device_update_handler(self.update_devices) self.etcd.register_device_update_handler(self.update_devices)
print("Attempting to add this device to etcd...", flush=True) print("Attempting to add this device to etcd...", flush=True)
self.etcd.add_device_to_cluster(self.my_device_id, self.syncthing_node_name, self.syncthing_publish_address) self.etcd.add_device_to_cluster(self.my_device_id, self.syncthing_node_name, self.syncthing_publish_address)
print("Added this device to cluster with publish address: {0}".format(self.syncthing_publish_address),
flush=True)
self.update_devices(None)
print("Entering loop...", flush=True)
self.loop() self.loop()
@staticmethod @staticmethod
@ -78,12 +83,17 @@ class SyncthingMonitor:
# noinspection PyUnusedLocal # noinspection PyUnusedLocal
def update_devices(self, event): def update_devices(self, event):
print("*** Updating syncthing based on change to cluster info ***", flush=True)
print("Obtaining updated device list...", flush=True)
device_list = self.etcd.get_device_list() device_list = self.etcd.get_device_list()
print("Adding new devices to syncthing...", flush=True)
self.syncthing.add_devices(device_list) self.syncthing.add_devices(device_list)
print("Updating shared folder with new devices...", flush=True)
self.syncthing.create_shared_folder(SHARED_FOLDER_ID, SHARED_FOLDER_LABEL, self.syncthing_data_path, self.syncthing.create_shared_folder(SHARED_FOLDER_ID, SHARED_FOLDER_LABEL, self.syncthing_data_path,
device_list) device_list)
self.syncthing.sync_config() self.syncthing.sync_config()
self.syncthing.print_config() self.syncthing.print_config()
print("*** Update complete ***", flush=True)
if __name__ == "__main__": if __name__ == "__main__":