Configurable if reboot on panic (default true)

Author: AndreasAakesson

starbase/CMakeLists.txt

@@ -57,5 +57,3 @@ set(LIBRARIES
 
 # include service build script
 include($ENV{INCLUDEOS_PREFIX}/includeos/post.service.cmake)
-
-diskbuilder(disk)

starbase/config.json

@@ -1,7 +1,8 @@
 {
-    "net" : [["10.0.0.42", "255.255.255.0", "10.0.0.1", "10.0.0.1"]], 
+    "net" : [["10.0.0.42", "255.255.255.0", "10.0.0.1", "10.0.0.1"]],
     "uplink" : {
-	"url" : "10.0.0.1:9090",
-	"token" : "kappa123"
+      "url" : "10.0.0.1:9090",
+      "token" : "kappa123",
+      "reboot" : true
     }
 }

ws_uplink.cpp

@@ -49,10 +49,13 @@ namespace uplink {
 
     // This is not totally safe...
     LIVEUPD_LOCATION = (void*) (OS::heap_max() - 0x2000000); // 32MB below heap_max
-    MYINFO("Maximum heap at (%p), assigning liveupdate location 32MB below (%p)", (void*)OS::heap_max(), LIVEUPD_LOCATION);
+    MYINFO("Maximum heap at (%p), assigning liveupdate location 32MB below (%p)",
+      (void*)OS::heap_max(), LIVEUPD_LOCATION);
 
     read_config();
 
+    CHECK(config_.reboot, "Reboot on panic");
+
     if(inet_.is_configured())
     {
       start(inet);
@@ -289,6 +292,12 @@ namespace uplink {
     config_.url   = cfg["url"].GetString();
     config_.token = cfg["token"].GetString();
 
+    // Reboot on panic (optional)
+    if(cfg.HasMember("reboot"))
+    {
+      config_.reboot = cfg["reboot"].GetBool();
+    }
+
   }
 
   template <typename Writer, typename Stack_ptr>
@@ -457,7 +466,8 @@ namespace uplink {
     send_message(Transport_code::PANIC, why, strlen(why));
     ws_->close();
     inet_.nic().flush();
-    OS::reboot();
+
+    if(config_.reboot) OS::reboot();
   }
 
   void WS_uplink::send_stats()

ws_uplink.hpp

@@ -38,6 +38,7 @@ class WS_uplink {
   {
     std::string url;
     std::string token;
+    bool        reboot = true;
   };
 
   WS_uplink(net::Inet<net::IP4>&);