Merge pull request #521 from ricmatsui/rm-monit

Use Monit to auto restart if CPU usage high in Native OSX strategy

example/docker-sync.yml

@@ -116,3 +116,11 @@ syncs:
     watch_args: '-v'
     # optional: default is fswatch, if set to disable, no watcher will be used and you would need to start the sync manually
     watch_strategy: 'fswatch'
+
+    # monit can be used to monitor the health of unison in the native_osx strategy and can restart unison if it detects a problem
+    # optional: use this to switch monit monitoring on
+    monit_enabled: false
+    # optional: use this to change how many seconds between each monit check (cycle)
+    monit_interval: 5
+    # optional: use this to change how many consecutive times high cpu usage must be observed before unison is restarted
+    monit_high_cpu_cycles: 2

lib/docker-sync/sync_strategy/native_osx.rb

@@ -65,6 +65,16 @@ def start_container
           env['OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
         end
 
+        monit_options = {
+          monit_enable: 'MONIT_ENABLE',
+          monit_interval: 'MONIT_INTERVAL',
+          monit_high_cpu_cycles: 'MONIT_HIGH_CPU_CYCLES',
+        }
+
+        monit_options.each do |key, env_key|
+          env[env_key] = @options[key.to_s] if @options.key?(key.to_s)
+        end
+
         host_disk_mount_mode = '' # see https://github.com/moby/moby/pull/31047
         host_disk_mount_mode = ":#{@options['host_disk_mount_mode']}" if @options.key?('host_disk_mount_mode')