Merge pull request #281 from SelfhostedPro/projects

fixed stepper in deploy form; tailing logs to last 200 logs; fix chan…
SelfhostedPro · Feb 10, 2021 · 81f13b1 · 81f13b1
2 parents dff7d31 + 2523a7c
commit 81f13b1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/backend/api/actions/apps.py b/backend/api/actions/apps.py
@@ -136,7 +136,7 @@ def deploy_app(template: schemas.DeployForm):
 
 def Merge(dict1, dict2):
     if dict1 and dict2:
-        updated_dict = dict2.update(dict1)
+        dict2.update(dict1)
         return dict2
     elif dict1:
         return dict1
@@ -163,7 +163,7 @@ def launch_app(
     edit
 ):
     dclient = docker.from_env()
-    if edit != False:
+    if edit == True:
         try:
             dclient.containers.get(name)
             try:
@@ -172,7 +172,8 @@ def launch_app(
             except Exception as e:
                 raise e
         except Exception as e:
-            raise e
+            # User probably changed the name so it doesn't conflict. If this is the case we'll just spin up a second container.
+            pass
 
 
 

diff --git a/backend/api/routers/apps.py b/backend/api/routers/apps.py
@@ -93,8 +93,7 @@ async def logs(websocket: WebSocket, app_name: str, Authorize: AuthJWT = Depends
     async with aiodocker.Docker() as docker:
         container: DockerContainer = await docker.containers.get(app_name)
         if container._container["State"]["Status"] == "running":
-            stats = container.stats(stream=True)
-            logs = container.log(stdout=True, stderr=True, follow=True, tail=1000)
+            logs = container.log(stdout=True, stderr=True, follow=True, tail=200)
             async for line in logs:
                 try:
                     await websocket.send_text(line)
@@ -206,7 +205,7 @@ async def process_container(name, stats, websocket):
             cpu_percent, cpu_system, cpu_total = await calculate_cpu_percent2(
                 line, cpu_total, cpu_system
             )
-        except KeyError as e:
+        except KeyError:
             print("error while getting new CPU stats: %r, falling back")
             cpu_percent = await calculate_cpu_percent(line)
 

diff --git a/frontend/src/components/applications/ApplicationDetailsComponents/AppLogs.vue b/frontend/src/components/applications/ApplicationDetailsComponents/AppLogs.vue
@@ -1,17 +1,15 @@
 <template>
   <v-card color="foreground" raised>
-    <v-card-title class="primary font-weight-bold">
-      Logs
-    </v-card-title>
+    <v-card-title class="primary font-weight-bold"> Logs</v-card-title>
     <v-card-text
       v-if="app.State.Status != 'running'"
       class="secondary text-center px-5 py-5"
     >
       Start the app to view logs
     </v-card-text>
     <v-virtual-scroll
+      v-chat-scroll="scrollOptions"
       v-else
-      v-chat-scroll="{enable: true, always: false, notSmoothOnInit: true}"
       :bench="20"
       :items="logs"
       height="600"
@@ -34,8 +32,9 @@ export default {
   props: ["app", "logs"],
   data() {
     return {
+      scrollOptions: { enable: true, always: false, smooth: false, notSmoothOnInit: true },
     };
-  }
+  },
 };
 </script>
 

diff --git a/frontend/src/components/applications/ApplicationsForm.vue b/frontend/src/components/applications/ApplicationsForm.vue
@@ -111,7 +111,7 @@
             </form>
             <v-btn
               color="primary"
-              @click="deployStep += 1"
+              @click="deployStep = 2"
               :disabled="invalid"
               class="float-right"
             >
@@ -253,15 +253,15 @@
             </form>
             <v-btn
               color="primary"
-              @click="deployStep += 1"
+              @click="deployStep = 3"
               :disabled="invalid"
               class="float-right"
             >
               Continue
             </v-btn>
             <v-btn
               color="secondary"
-              @click="deployStep -= 1"
+              @click="deployStep = 1"
               class="mx-2 float-right primary--text"
             >
               Back
@@ -331,15 +331,15 @@
             </form>
             <v-btn
               color="primary"
-              @click="deployStep += 1"
+              @click="deployStep = 4"
               :disabled="invalid"
               class="float-right"
             >
               Continue
             </v-btn>
             <v-btn
               color="secondary"
-              @click="deployStep -= 1"
+              @click="deployStep = 2"
               class="mx-2 float-right primary--text"
             >
               Back
@@ -425,7 +425,7 @@
             </v-btn>
             <v-btn
               color="secondary"
-              @click="deployStep -= 1"
+              @click="deployStep = 3"
               class="mx-2 float-right primary--text"
             >
               Back
@@ -867,6 +867,7 @@ export default {
         })
         .catch((err) => {
           this.isLoading = false;
+          this.deployStep = 1;
           this.setErr(err);
         });
     },

diff --git a/frontend/src/store/modules/images.js b/frontend/src/store/modules/images.js
@@ -41,6 +41,7 @@ const actions = {
       .get(url)
       .then(response => {
         const images = response.data;
+        console.log(images)
         commit("setImages", images);
       })
       .catch(err => {