Merge pull request #749 from OpenC3/no_load_script_on_run

Prevent loading previous script on script run

Author: ryanmelt

openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/ScriptRunner.vue

@@ -865,11 +865,6 @@ export default {
       this.updateBreakpoints($event, session)
     })
 
-    if (localStorage['script_runner__filename']) {
-      this.filename = localStorage['script_runner__filename']
-      this.reloadFile()
-    }
-
     window.addEventListener('keydown', this.keydown)
     this.cable = new Cable('/script-api/cable')
     await this.tryLoadRunningScript(this.$route.params.id)
@@ -1008,6 +1003,10 @@ export default {
             this.alertText = `Currently ${response.data.length} running scripts.`
             this.showAlert = true
           }
+          if (localStorage['script_runner__filename']) {
+            this.filename = localStorage['script_runner__filename']
+            this.reloadFile()
+          }
         }
       })
     },

openc3/lib/openc3/utilities/local_mode.rb

@@ -431,7 +431,7 @@ def self.sync_tool_config()
             # Parse just to ensure we have valid JSON
             JSON.parse(data, :allow_nan => true, :create_additions => true)
             # Only save if the parse was successful
-            ToolConfigModel.save_config(parts[-2], File.basename(config), data, scope: scope, local_mode: false)
+            ToolConfigModel.save_config(parts[-2], File.basename(config, '.json'), data, scope: scope, local_mode: false)
           rescue JSON::ParserError => error
             puts "Unable to initialize tool config due to #{error.message}"
           end

openc3/spec/utilities/local_mode_spec.rb

@@ -213,8 +213,8 @@ def setup_plugin_test(scope: 'DEFAULT')
           expect(rubys3_client).to receive(:get_object).with({bucket: 'config', key: key, response_target: full_path })
         end
 
-        expect(ToolConfigModel).to receive(:save_config).with("telemetry-grapher", "temps.json", "[]", {:local_mode=>false, :scope=>"DEFAULT"})
-        expect(ToolConfigModel).to receive(:save_config).with("tlm-viewer", "screens.json", "[]", {:local_mode=>false, :scope=>"DEFAULT"})
+        expect(ToolConfigModel).to receive(:save_config).with("telemetry-grapher", "temps", "[]", {:local_mode=>false, :scope=>"DEFAULT"})
+        expect(ToolConfigModel).to receive(:save_config).with("tlm-viewer", "screens", "[]", {:local_mode=>false, :scope=>"DEFAULT"})
         expect(SettingModel).to receive(:set).with({name: "classification_banner", data: "{\"text\":\"CLASS\"}"}, {:scope=>"DEFAULT"})
         expect(SettingModel).to receive(:set).with({name: "source_url", data: "https://github.com/openc3/cosmos"}, {:scope=>"DEFAULT"})
 

scripts/linux/openc3_util.sh

@@ -150,9 +150,17 @@ case $1 in
     cleanFiles
     ;;
   hostsetup )
-    docker run --rm --privileged --pid=host justincormack/nsenter1 /bin/sh -c "echo never > /sys/kernel/mm/transparent_hugepage/enabled"
-    docker run --rm --privileged --pid=host justincormack/nsenter1 /bin/sh -c "echo never > /sys/kernel/mm/transparent_hugepage/defrag"
-    docker run --rm --privileged --pid=host justincormack/nsenter1 /bin/sh -c "sysctl -w vm.max_map_count=262144"
+    if [ "$#" -ne 4 ]; then
+      echo "Usage: hostsetup <REPO> <NAMESPACE> <TAG>" >&2
+      echo "e.g. hostsetup docker.io openc3inc latest" >&2
+      exit 1
+    fi
+    repo=$2
+    namespace=$3
+    tag=$4
+    docker run --rm --privileged --pid=host --entrypoint='' --user root $repo/$namespace/openc3-operator:$tag nsenter -t 1 -m -u -n -i -- sh -c "echo never > /sys/kernel/mm/transparent_hugepage/enabled"
+    docker run --rm --privileged --pid=host --entrypoint='' --user root $repo/$namespace/openc3-operator:$tag nsenter -t 1 -m -u -n -i -- sh -c "echo never > /sys/kernel/mm/transparent_hugepage/defrag"
+    docker run --rm --privileged --pid=host --entrypoint='' --user root $repo/$namespace/openc3-operator:$tag nsenter -t 1 -m -u -n -i -- sh -c "sysctl -w vm.max_map_count=262144"
     ;;
   * )
     usage $0

scripts/windows/openc3_util.bat

@@ -90,8 +90,8 @@ GOTO :EOF
 
 :tag
   if "%5" == "" (
-    @echo "Usage: push <REPO1> <REPO2> <NAMESPACE1> <TAG1> <NAMESPACE2> <TAG2>" 1>&2
-    @echo "e.g. push docker.io localhost:12345 openc3 latest" 1>&2
+    @echo "Usage: tag <REPO1> <REPO2> <NAMESPACE1> <TAG1> <NAMESPACE2> <TAG2>" 1>&2
+    @echo "e.g. tag docker.io localhost:12345 openc3 latest" 1>&2
     @echo "Note: NAMESPACE2 and TAG2 default to NAMESPACE1 and TAG1 if not given" 1>&2
     GOTO :EOF
   )
@@ -164,9 +164,20 @@ GOTO :EOF
 GOTO :EOF
 
 :hostsetup
-  docker run --rm --privileged --pid=host justincormack/nsenter1 /bin/sh -c "echo never > /sys/kernel/mm/transparent_hugepage/enabled" || exit /b
-  docker run --rm --privileged --pid=host justincormack/nsenter1 /bin/sh -c "echo never > /sys/kernel/mm/transparent_hugepage/defrag" || exit /b
-  docker run --rm --privileged --pid=host justincormack/nsenter1 /bin/sh -c "sysctl -w vm.max_map_count=262144" || exit /b
+  if "%5" == "" (
+    set repo=%~2
+    set namespace=%~3
+    set tag=%~4
+
+    echo on
+    docker run --rm --privileged --pid=host --entrypoint='' --user root !repo!/!namespace!/openc3-operator:!tag! nsenter -t 1 -m -u -n -i -- sh -c "echo never > /sys/kernel/mm/transparent_hugepage/enabled" || exit /b
+    docker run --rm --privileged --pid=host --entrypoint='' --user root !repo!/!namespace!/openc3-operator:!tag! nsenter -t 1 -m -u -n -i -- sh -c "echo never > /sys/kernel/mm/transparent_hugepage/defrag" || exit /b
+    docker run --rm --privileged --pid=host --entrypoint='' --user root !repo!/!namespace!/openc3-operator:!tag! nsenter -t 1 -m -u -n -i -- sh -c "sysctl -w vm.max_map_count=262144" || exit /b
+    echo off
+  ) else (
+    @echo "Usage: hostsetup <REPO> <NAMESPACE> <TAG>" 1>&2
+    @echo "e.g. hostsetup docker.io openc3inc latest" 1>&2
+  )
 GOTO :EOF
 
 :usage