Fix shutdown_timeout serialization

Signed-off-by: David McNeil <mcneil.david2@gmail.com>
habitat-sh · Jun 6, 2019 · ec04702 · ec04702
1 parent 369ed1a
commit ec04702
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/components/core/src/os/process/mod.rs b/components/core/src/os/process/mod.rs
@@ -41,7 +41,8 @@ use time::Duration;
 /// around, and turn it into a `time::Duration` at the last possible
 /// moment.)
 #[derive(Deserialize, Serialize, Eq, PartialEq, Debug, Clone, Copy, Hash)]
-pub struct ShutdownTimeout(#[serde(with = "serde_string")] u32);
+#[serde(from = "u32")]
+pub struct ShutdownTimeout(u32);
 
 impl Default for ShutdownTimeout {
     /// Unless otherwise specified, the Supervisor will wait 8 seconds

diff --git a/components/sup/src/manager/service/spec.rs b/components/sup/src/manager/service/spec.rs
@@ -447,7 +447,7 @@ mod test {
         assert!(toml.contains(r#"[health_check_interval]"#));
         assert!(toml.contains(r#"secs = 123"#));
         assert!(toml.contains(r#"nanos = 0"#));
-        assert!(toml.contains(r#"shutdown_timeout = "10""#));
+        assert!(toml.contains(r#"shutdown_timeout = 10"#));
     }
 
     #[test]