Merge branch 'no-apps-lock-on-loggin' into properly-restart-apps

guojun85 · Aug 20, 2013 · 1b22d88 · 1b22d88
2 parents 5dcfe67 + ccb8ee7
commit 1b22d88
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/AppController/djinn.rb b/AppController/djinn.rb
@@ -829,10 +829,8 @@ def get_stats(secret)
     }
 
     stats['apps'] = {}
-    APPS_LOCK.synchronize {
-      @app_names.each { |name|
-        stats['apps'][name] = @apps_loaded.include?(name)
-      }
+    @app_names.each { |name|
+      stats['apps'][name] = @apps_loaded.include?(name)
     }
     return stats
   end
@@ -1697,12 +1695,10 @@ def self.log_to_buffer(level, message)
     return if message.empty?
     return if level < @@log.level
     time = Time.now
-    APPS_LOCK.synchronize {
-      @@logs_buffer << {
-        'timestamp' => time.to_i,
-        'level' => level + 1,  # Python and Java are one higher than Ruby
-        'message' => message
-      }
+    @@logs_buffer << {
+      'timestamp' => time.to_i,
+      'level' => level + 1,  # Python and Java are one higher than Ruby
+      'message' => message
     }
     return
   end