corrade-lsl-templates – Diff between revs 41 and 42

Subversion Repositories:

?pathlinks?

Rev 41 – Details – Blame – Last modification – View Log

             return;
         // Remove command.
         command = llDeleteSubList(command, 0, 0);
-        // Get an URL.
+        // Get heartbeat.
-        state url;
+        state heartbeat;
+    }
     on_rez(integer num) {
         llResetScript();
             llResetScript();
+        }
+    }
+}
-state url {
-    state_entry() {
-        // DEBUG
-        llOwnerSay("[Heartbeat] Requesting URL...");
-        llRequestURL();
-    }
-    http_request(key id, string method, string body) {
-        if(method != URL_REQUEST_GRANTED) return;
-        URL = body;
-        // DEBUG
-        llOwnerSay("[Heartbeat] Got URL...");
-        state version;
-    }
-    on_rez(integer num) {
-        llResetScript();
-    }
-    changed(integer change) {
-        if((change & CHANGED_INVENTORY) ||
-            (change & CHANGED_REGION_START) ||
-            (change & CHANGED_OWNER)) {
-            llResetScript();
-        }
-    }
-}
-state version {
+state heartbeat {
     state_entry() {
         // DEBUG
         llOwnerSay("[Heartbeat] Getting heartbeat data...");
         llInstantMessage(
                     ),
                     "data", wasListToCSV(
+                        [
                             "AverageCPUUsage",
                             "AverageRAMUsage",
+                            "AverageNETUsage",
                             "Uptime"
+                        ]
                     ),
-                    "callback", wasURLEscape(URL)
+                    "callback", wasURLEscape(
+                        wasKeyValueGet(
+                            "URL",
+                            configuration
+                        )
+                    )
+                ]
+            )
         );
         llSetTimerEvent(60);
+    }
-    http_request(key id, string method, string body) {
+    link_message(integer sender, integer num, string body, key id) {
-        llHTTPResponse(id, 200, "OK");
+        // Only process callbacks for the database command.
-        llReleaseURL(URL);
-        if(wasKeyValueGet("command", body) != "getheartbeatdata" ||
+        if(id != "callback" || wasKeyValueGet("command", body) != "getheartbeatdata")
+            return;
-            wasKeyValueGet("success", body) != "True") {
+        if(wasKeyValueGet("success", body) != "True") {
             // DEBUG
             llOwnerSay("[Heartbeat] Unable to get heartbeat data: " +
                 wasURLUnescape(
                     wasKeyValueGet("error", body)
+                )
                     ["AverageRAMUsage"]
                 ) + 1
             ) / 1024 / 1024
         );
+        // AverageNETUsage is returned in bytes,
+        // so convert the value to MiB and round.
+        string NET = (string)llRound(
+            llList2Float(
+                stats,
+                llListFindList(
+                    stats,
+                    ["AverageNETUsage"]
+                ) + 1
+            ) / 1024 / 1024
+        );
         string uptime = llList2String(
             stats,
             llListFindList(
                 stats,
                 ["Uptime"]
             ) + 1
         );
-        data = "RAM: " + RAM + "MiB" + " CPU: " + CPU + "%" + " Uptime: " + uptime;
+        data = "RAM: " + RAM + "MiB" + " CPU: " + CPU + "%" + " NET: " + NET + "MiB" + " Uptime: " + uptime;
-        state tell;
         state tell;
     timer() {
-        llReleaseURL(URL);
+    timer() {
         state listen_group;
+    }