[gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/files/

[Fabian Groffen]

commit:     f7a993660f555e760276cfedcde6ceecfa1434c7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 07:27:40 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 07:27:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a99366

app-admin/diamond: increase stop timeout, shutdown is a slow process

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-admin/diamond/files/diamond.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd
index 6473dac288c..168b175a788 100644
--- a/app-admin/diamond/files/diamond.initd
+++ b/app-admin/diamond/files/diamond.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -14,6 +14,6 @@ start() {
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid --name diamond
+	start-stop-daemon --stop -R 80 --pidfile /run/${SVCNAME}.pid
 	eend $?
 }

[gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/files/

[Fabian Groffen]

commit:     89ff8af47a68d0c35f89266812ad40fe1251479e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 13:16:16 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 31 13:16:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ff8af4

app-admin/diamond: drop unused files

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/diamond/files/diamond-4.0-psutil.patch | 48 ------------------------
 1 file changed, 48 deletions(-)

diff --git a/app-admin/diamond/files/diamond-4.0-psutil.patch b/app-admin/diamond/files/diamond-4.0-psutil.patch
deleted file mode 100644
index e5f5d3bfb39..00000000000
--- a/app-admin/diamond/files/diamond-4.0-psutil.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001
-From: Fabian Groffen <grobian@gentoo.org>
-Date: Mon, 3 Aug 2015 19:40:59 +0200
-Subject: [PATCH 1/2] NetworkCollector: psutil.network_io_counters was renamed
-
----
- src/collectors/network/network.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/collectors/network/network.py b/src/collectors/network/network.py
-index d835162..90c2f59 100644
---- a/src/collectors/network/network.py
-+++ b/src/collectors/network/network.py
-@@ -96,7 +96,7 @@ def collect(self):
-                 self.log.error('No network metrics retrieved')
-                 return None
- 
--            network_stats = psutil.network_io_counters(True)
-+            network_stats = psutil.net_io_counters(True)
-             for device in network_stats.keys():
-                 network_stat = network_stats[device]
-                 results[device] = {}
-
-From 314d6057ca95bae6d3e6369556522574eb905c3f Mon Sep 17 00:00:00 2001
-From: Fabian Groffen <grobian@gentoo.org>
-Date: Mon, 3 Aug 2015 19:41:20 +0200
-Subject: [PATCH 2/2] MemoryCollector: psutil renamed phymem_usage and
- virtmem_usage
-
----
- src/collectors/memory/memory.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/collectors/memory/memory.py b/src/collectors/memory/memory.py
-index 7c9b1fb..9057115 100644
---- a/src/collectors/memory/memory.py
-+++ b/src/collectors/memory/memory.py
-@@ -103,8 +103,8 @@ def collect(self):
-                 self.log.error('No memory metrics retrieved')
-                 return None
- 
--            phymem_usage = psutil.phymem_usage()
--            virtmem_usage = psutil.virtmem_usage()
-+            phymem_usage = psutil.virtual_memory()
-+            virtmem_usage = psutil.swap_memory()
-             units = 'B'
- 
-             for unit in self.config['byte_unit']: