Permalink
Browse files

catch stop watch exception

  • Loading branch information...
1 parent 5b1d4b0 commit 71c44fe1349abd81a1474b008fcf14583e930209 @tka tka committed Apr 30, 2013
Showing with 8 additions and 8 deletions.
  1. +6 −1 src/app_watcher.rb
  2. +2 −7 src/compile_version.rb
View
@@ -21,7 +21,12 @@ def watch!
def stop
log_action(:info, "AppWatcher stop!",{})
- listener.stop
+ begin
+ listener.stop
+ rescue Exception => e
+ log_action(:warning, "#{e.message}\n#{e.backtrace}", {})
+ end
+
end
def coffeescript_watchers
@@ -1,10 +1,5 @@
module CompileVersion
-<<<<<<< HEAD
- REVISION = 'e6d27b9d0c'
- COMPILE_TIME = '201304291426'
-=======
- REVISION = '95af139f91'
- COMPILE_TIME = '201304291610'
->>>>>>> cd57afa... update rawr
+ REVISION = 'fcfabcaf72'
+ COMPILE_TIME = '201304291620'
UPDATE_URL = ''
end

0 comments on commit 71c44fe

Please sign in to comment.