From: Arvin Schnell <aschnell@suse.de>
Date: Mon, 23 Jul 2018 19:10:01 +0000 (+0200)
Subject: - unload snappers early (not by global destructors)
X-Git-Tag: v0.5.6^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea181b9399e347b96faf8498c2a7a2187de8a7f8;p=thirdparty%2Fsnapper.git

- unload snappers early (not by global destructors)
---

diff --git a/server/MetaSnapper.cc b/server/MetaSnapper.cc
index dba3401d..f9b104af 100644
--- a/server/MetaSnapper.cc
+++ b/server/MetaSnapper.cc
@@ -200,6 +200,14 @@ MetaSnappers::init()
 }
 
 
+void
+MetaSnappers::unload()
+{
+    for (iterator it = entries.begin(); it != entries.end(); ++it)
+	it->unload();
+}
+
+
 MetaSnappers::iterator
 MetaSnappers::find(const string& config_name)
 {
diff --git a/server/MetaSnapper.h b/server/MetaSnapper.h
index c370c034..da3090ce 100644
--- a/server/MetaSnapper.h
+++ b/server/MetaSnapper.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) [2012-2015] Novell, Inc.
+ * Copyright (c) 2018 SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -123,6 +124,8 @@ public:
 
     void init();
 
+    void unload();
+
     typedef list<MetaSnapper>::iterator iterator;
     typedef list<MetaSnapper>::const_iterator const_iterator;
 
diff --git a/server/snapperd.cc b/server/snapperd.cc
index 8623015d..13e563ef 100644
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) [2012-2015] Novell, Inc.
+ * Copyright (c) 2018 SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -286,5 +287,7 @@ main(int argc, char** argv)
 
     y2mil("Exiting");
 
+    meta_snappers.unload();
+
     return 0;
 }