Merge

src/main.rs

@@ -8,16 +8,18 @@ use nickel::{Nickel, MediaType, status::StatusCode};
 use systemstat::{System, Platform};
 
 #[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 struct LoadInformation {
-    oneMinute: f32,
+    one_minute: f32,
-    fiveMinutes:  f32,
+    five_minutes:  f32,
-    fifteenMinutes: f32
+    fifteen_minutes: f32
 }
 
 #[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 struct Error {
-    errorCode: String,
+    error_code: String,
-    errorMessage: String
+    error_message: String
 }
 
 fn main() {
@@ -37,9 +39,9 @@ fn main() {
                 Ok(loadavg) => {
 
                     let result = LoadInformation {
-                        oneMinute: loadavg.one,
+                        one_minute: loadavg.one,
-                        fiveMinutes: loadavg.five,
+                        five_minutes: loadavg.five,
-                        fifteenMinutes: loadavg.fifteen
+                        fifteen_minutes: loadavg.fifteen
                     };
 
                     serde_json::to_string(&result).unwrap()
@@ -53,8 +55,8 @@ fn main() {
                     _res.set(StatusCode::ServiceUnavailable);   // HTTP Error 503
 
                     let result = Error {
-                        errorCode: String::from("E_LOADAVG_UNAVAILABLE"),
+                        error_code: String::from("E_LOADAVG_UNAVAILABLE"),
-                        errorMessage: String::from("Error while fetching load average from system stats.")
+                        error_message: String::from("Error while fetching load average from system stats.")
                     };
 
                     serde_json::to_string(&result).unwrap()