lib/gitdocs/manager.rb in gitdocs-0.4.7 vs lib/gitdocs/manager.rb in gitdocs-0.4.8

@@ -27,45 +27,58 @@
       self.log "Starting Gitdocs v#{VERSION}..."
       self.log "Using configuration root: '#{self.config.config_root}'"
       self.log "Shares: #{config.shares.map(&:inspect).join(", ")}"
       # Start the repo watchers
       runners = nil
-      EM.run do
-        self.log "Starting EM loop..."
-        @runners = config.shares.map { |share| Runner.new(share) }
-        @runners.each(&:run)
-        # Start the web front-end
-        if self.config.global.start_web_frontend
-          Server.new(self, *@runners).start
-          EM.defer( proc {
-            i = 0
-            web_started = false
-            begin
-              TCPSocket.open('127.0.0.1', 8888).close
-              web_started = true
-            rescue Errno::ECONNREFUSED
-              self.log "Retrying server loop..."
-              sleep 0.2
-              i += 1
-              retry if i <= 20
-            end
-            system("open http://localhost:8888/") if self.config.global.load_browser_on_startup && web_started
-          }, proc {
-            self.log "Web server running!"
-          })
+      retrying = false
+      begin
+        EM.run do
+          self.log "Starting EM loop..."
+          @runners = config.shares.map { |share|
+            self.log "Starting #{share}"
+            Runner.new(share)
+          }
+          self.log "Running runners... #{@runners.size}"
+          @runners.each(&:run)
+          # Start the web front-end
+          if self.config.global.start_web_frontend
+            Server.new(self, *@runners).start
+            EM.defer( proc {
+              i = 0
+              web_started = false
+              begin
+                TCPSocket.open('127.0.0.1', 8888).close
+                web_started = true
+              rescue Errno::ECONNREFUSED
+                self.log "Retrying server loop..."
+                sleep 0.2
+                i += 1
+                retry if i <= 20
+              end
+              system("open http://localhost:8888/") if !retrying && self.config.global.load_browser_on_startup && web_started
+            }, proc {
+              self.log "Web server running!"
+            })
+          end
         end
+      rescue Restart
+        retrying = true
+        retry
       end
     rescue Exception => e # Report all errors in log
       self.log(e.class.inspect + " - " + e.inspect + " - " + e.message.inspect, :error)
       self.log(e.backtrace.join("\n"), :error)
       raise
     ensure
       self.log("Gitdocs is terminating...goodbye\n\n")
     end
 
     def restart
-      stop
-      start
+      Thread.new do
+        Thread.main.raise Restart, "restarting ... "
+        sleep 0.1 while EM.reactor_running?
+        start
+      end
     end
 
     def stop
       EM.stop
     end
\ No newline at end of file