Merge branch 'reactlabs_changes'

bytebeamio · Jan 6, 2023 · f46e8ca · f46e8ca
2 parents cb5444b + 0c3f894
commit f46e8ca
Show file tree

Hide file tree

Showing 8 changed files with 163 additions and 247 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -68,7 +68,9 @@ archs.forEach { arch ->
             println(String(process.inputStream.readAllBytes()))
             println(String(process.errorStream.readAllBytes()))
 
-            assert(process.waitFor() == 0)
+            if (process.waitFor() != 0) {
+                throw Exception("cargo build failed")
+            }
         }
     }
 
@@ -95,7 +97,9 @@ archs.forEach { arch ->
             println(String(process.inputStream.readAllBytes()))
             println(String(process.errorStream.readAllBytes()))
 
-            assert(process.waitFor() == 0)
+            if (process.waitFor() != 0) {
+                throw Exception("cargo build failed")
+            }
         }
     }
 
@@ -112,7 +116,7 @@ archs.forEach { arch ->
     }
 
     task("copy-utilities-$arch", type = Copy::class) {
-        arrayOf("logrotate").forEach { utility ->
+        arrayOf("logrotate", "uplink_watchdog").forEach { utility ->
             from(root.resolve(root.resolve(Paths.get("utilities", "target", arch, "release", utility))))
         }
         into(stage.resolve(arch).resolve("bin"))
@@ -168,3 +172,8 @@ tasks.create("buildArtifacts") {
     }
     dependsOn("copy-lib")
 }
+
+fun<T> trace(value: T) : T {
+    println(value)
+    return value
+}
diff --git a/module_template/bin/daemonize b/module_template/bin/daemonize
@@ -1,2 +1,2 @@
 #!/system/bin/sh
-nohup "$@" > /dev/null &
+nohup "$@" > /dev/null 2>&1 &
diff --git a/module_template/etc/uplink.config.toml b/module_template/etc/uplink.config.toml
@@ -5,8 +5,8 @@ path = "/data/local/uplink/persistence"
 max_file_size = 104857600
 max_file_count = 3
 
-[ota]
-enabled = true
+[downloader]
+actions = ["update_firmware"]
 path = "/data/local/uplink/ota"
 
 [stats]

diff --git a/module_template/service.sh b/module_template/service.sh
@@ -1,10 +1,12 @@
 #!/system/bin/sh
 
-MODULE_DIR=/data/local/uplinkmodule
+MODULE_DIR=$(dirname "$0")
 DATA_DIR=/data/local/uplink
 
+pkill -x uplink_watchdog
 pkill -x uplink
 mkdir -p $DATA_DIR
 
 cd $DATA_DIR|| exit
 ("$MODULE_DIR"/bin/uplink -a $DATA_DIR/device.json -c "$MODULE_DIR"/etc/uplink.config.toml -v 2>&1 | "$MODULE_DIR"/bin/logrotate --output $DATA_DIR/out.log) &
+"$MODULE_DIR"/bin/uplink_watchdog >> $DATA_DIR/restart.log 2>&1