Merge pull request #548 from hpi-swt2/dev

Update Master
hpi-swt2 · May 3, 2019 · 81dab7a · 81dab7a
2 parents 7b0c6b5 + 22d7846
commit 81dab7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/api/v_sphere/connection.rb b/app/api/v_sphere/connection.rb
@@ -56,7 +56,15 @@ def initialize_settings
 
     def connect
       return unless configured?
-      create_connection if @vim.nil?
+
+      # only create new connection if there is no other valid, because otherwise it will allocate more and more tcp
+      # connections until it is not possible to create more and thus the server will throw an error
+      create_connection if @vim.nil? || !connected?
+    end
+
+    # currentSession is nil if session does not exist, e.g. because it disconnected
+    def connected?
+      !@vim.serviceContent.sessionManager.currentSession.nil?
     end
 
     def create_connection

diff --git a/config/deploy/production.rb b/config/deploy/production.rb
@@ -16,4 +16,4 @@
 set :slack_emoji, ':production:' # will be used as the avatar for the message
 set :slack_stage, 'master'
 
-set :base_url, 'https://hart.epic-hpi.de'
+set :base_url, 'vm-swt-hrmt-master.eaalab.hpi.uni-potsdam.de'