Merge pull request #2057 from cdonati/enable-app-after-upload

Wait until the app is uploaded before enabling
AppScale · Jun 19, 2016 · 456ff77 · 456ff77
2 parents ad42edf + 96cc19e
commit 456ff77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/AppController/djinn.rb b/AppController/djinn.rb
@@ -2000,6 +2000,8 @@ def done_uploading(appname, location, secret)
     if File.exists?(location)
       begin
         ZKInterface.add_app_entry(appname, my_node.public_ip, location)
+        uac = UserAppClient.new(my_node.private_ip, @@secret)
+        uac.enable_app(appname)
         result = "Found #{appname} in zookeeper."
       rescue FailedZooKeeperOperationException => e
         Djinn.log_warn("(done_uploading) couldn't talk to zookeeper " +

diff --git a/AppDB/soap_server.py b/AppDB/soap_server.py
@@ -158,7 +158,7 @@ def __init__(self, name, owner, language):
     self.last_time_updated_date_ = str(self.creation_date_)
     self.cksum_ = "0"
     self.num_entries_ = "0"
-    self.enabled_ = "true"
+    self.enabled_ = "false"
     self.indexes_ = "0"
     return