Merge branch 'pretzel-unstable' into 'pretzel'

Added error statements for Failed Starts

See merge request crafty-controller/crafty-commander!32

app/classes/shared/server.py

@@ -140,8 +140,14 @@ class Server:
         try:
             self.process = pexpect.spawn(self.server_command, cwd=self.server_path, timeout=None, encoding=None)
         except Exception as ex:
-            logger.error("Server {} failed to start with error code: {}".format(self.name, ex))
+            msg = "Server {} failed to start with error code: {}".format(self.name, ex)
+            logger.error(msg)
+            websocket_helper.broadcast('send_start_error', {
+                'error': msg
+            })
             return False
+        websocket_helper.broadcast('send_start_reload', {
+        })
         self.is_crashed = False
 
         self.start_time = str(datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S'))

app/frontend/templates/base.html

@@ -219,6 +219,46 @@
       var webSocket;
     // {% end%}
 
+if (webSocket) {
+    webSocket.on('send_start_error', function (start_error) {
+
+       var closeEl = document.createElement('span');
+      var strongEL = document.createElement('strong');
+      var msgEl = document.createElement('div');
+
+      closeEl.innerHTML = '×';
+      strongEL.textContent = 'Warning: ';
+      msgEl.append(strongEL, start_error.error);
+
+
+      closeEl.style.marginLeft = '15px';
+      closeEl.style.fontWeight = 'bold';
+      closeEl.style.float = 'right';
+      closeEl.style.fontSize = '22px';
+      closeEl.style.lineHeight = '20px';
+      closeEl.style.cursor = 'pointer';
+
+      closeEl.addEventListener('click', function () {this.parentElement.style.display='none';});
+
+      var parentEl = document.createElement('div');
+
+      parentEl.style.padding = '20px';
+      parentEl.style.backgroundColor = '#f7970f';
+
+      parentEl.appendChild(closeEl);
+      parentEl.appendChild(msgEl);
+
+      document.querySelector('.warnings').appendChild(parentEl);
+    });
+  }
+
+  if (webSocket) {
+    webSocket.on('send_start_reload', function (start_error) {
+    location.reload()
+    });
+  }
+
+
     function warn(message) {
       var closeEl = document.createElement('span');
       var strongEL = document.createElement('strong');

app/frontend/templates/panel/dashboard.html

@@ -229,7 +229,11 @@ function send_command (server_id, command){
     success: function(data){
       console.log("got response:");
       console.log(data);
-      setTimeout(function(){ location.reload(); }, 10000);
+      setTimeout(function(){
+      if (command != 'start_server'){
+            location.reload();
+          }
+      }, 10000);
 
     }
   });

app/frontend/templates/panel/server_term.html

@@ -127,7 +127,11 @@
         success: function(data){
           console.log("got response:");
           console.log(data);
-          setTimeout(function(){ location.reload(); }, 10000);
+          setTimeout(function(){
+          if (command != 'start_server'){
+            location.reload();
+          }
+          }, 10000);
 
         }
       });
@@ -144,7 +148,6 @@
         }
     });
   }
-
     // Convert running to lower case (example: 'True' converts to 'true') and
     // then to boolean via JSON.parse()
     let online = JSON.parse('{{ data['server_stats']['running'] }}'.toLowerCase());