Merge pull request #45 from runabove/ns

fix: sink files are not processed
ovh · Aug 7, 2017 · a354140 · a354140
2 parents abe8d99 + 5084901
commit a354140
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "beamium"
-version = "1.6.4"
+version = "1.6.5"
 authors = [ "d33d33 <kevin.georges@corp.ovh.com>" ]
 
 build = "build.rs"

diff --git a/src/router.rs b/src/router.rs
@@ -68,7 +68,8 @@ fn route(sinks: &Vec<config::Sink>,
          -> Result<usize, Box<Error>> {
     let mut proc_size = 0;
     let mut batch_count = 0;
-    let start = time::now_utc().to_timespec().sec;
+    let start = time::now_utc().to_timespec();
+    let run_id = format!("{}#{}", start.sec, start.nsec);
 
     loop {
         if sigint.load(Ordering::Relaxed) {
@@ -188,7 +189,7 @@ fn route(sinks: &Vec<config::Sink>,
 
         // Rotate
         for sink in sinks {
-            let dest_file = dir.join(format!("{}-{}-{}.metrics", sink.name, start, batch_count));
+            let dest_file = dir.join(format!("{}-{}-{}.metrics", sink.name, run_id, batch_count));
             debug!("rotate tmp sink file to {}", format!("{:?}", dest_file));
             try!(fs::rename(dir.join(format!("{}.tmp", sink.name)), dest_file));
         }