From f7ed96131718b5186538a504f66393fcb3531e0c Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@googlemail.com>
Date: Thu, 19 Dec 2019 16:09:52 +0100
Subject: [PATCH] Deleting beacon file at shutdown

---
 CHANGELOG.md |  1 +
 src/cloud.rs | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cc4902..302a169 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This project follows [semantic versioning](http://semver.org).
 - [changed] Also drop privileges in foreground mode
 - [changed] Set builders to Ubuntu 16.04 and CentOS 7
 - [changed] Set keepalive to 120 secs when NAT is detected
+- [changed] Deleting beacon file at shutdown
 - [fixed] Added parameter keepalive to manpage
 - [fixed] Fixed problems on stats file when dropping permissions
 - [fixed] Deleting files before overwriting them
diff --git a/src/cloud.rs b/src/cloud.rs
index 6faf9dc..9640ec9 100644
--- a/src/cloud.rs
+++ b/src/cloud.rs
@@ -6,11 +6,12 @@ use std::{
     cmp::min,
     collections::HashMap,
     fmt,
-    fs::File,
+    fs::{self, File},
     hash::BuildHasherDefault,
     io::{self, Write},
     marker::PhantomData,
-    net::{SocketAddr, ToSocketAddrs}
+    net::{SocketAddr, ToSocketAddrs},
+    path::Path
 };
 
 use fnv::FnvHasher;
@@ -826,6 +827,15 @@ impl<D: Device, P: Protocol, T: Table, S: Socket, TS: TimeSource> GenericCloud<D
         }
         info!("Shutting down...");
         self.broadcast_msg(&mut Message::Close).ok();
+        if let Some(ref path) = self.config.beacon_store {
+            let path = Path::new(path);
+            if path.exists() {
+                info!("Removing beacon file");
+                if let Err(e) = fs::remove_file(path) {
+                    error!("Failed to remove beacon file: {}", e)
+                }
+            }
+        }
     }
 }