piotrp pushed to carbon-c-relay (f21). "fix udp, sighug on logrotate, allow percent"

[notifications at fedoraproject.org]

From f6f501a5b693eb03dac1168dbb190f5a3a3708e2 Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212 at gmail.com>
Date: Fri, 1 May 2015 11:14:32 +0200
Subject: fix udp, sighug on logrotate, allow percent


diff --git a/.gitignore b/.gitignore
index 55bd2d8..91c9637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /carbon-c-relay-20076363b928af35357f4a781227dfdc2751979c.tar.gz
+/carbon-c-relay-a45e94180836ce994f97bbfea16ea105748e61f4.tar.gz
diff --git a/carbon-c-relay-allow-percent.diff b/carbon-c-relay-allow-percent.diff
new file mode 100644
index 0000000..0eb9093
--- /dev/null
+++ b/carbon-c-relay-allow-percent.diff
@@ -0,0 +1,13 @@
+diff --git a/dispatcher.c b/dispatcher.c
+index 96d1dc4..1ebc9b8 100644
+--- a/dispatcher.c
++++ b/dispatcher.c
+@@ -360,7 +360,7 @@ dispatch_connection(connection *conn, dispatcher *self)
+ 					(*p >= 'a' && *p <= 'z') ||
+ 					(*p >= 'A' && *p <= 'Z') ||
+ 					(*p >= '0' && *p <= '9') ||
+-					*p == '-' || *p == '_' || *p == ':' || *p == '#')
++					*p == '-' || *p == '_' || *p == ':' || *p == '#' || *p == '%')
+ 			{
+ 				/* copy char */
+ 				*q++ = *p;
diff --git a/carbon-c-relay.logrotate b/carbon-c-relay.logrotate
index cc630ce..7ab85e5 100644
--- a/carbon-c-relay.logrotate
+++ b/carbon-c-relay.logrotate
@@ -6,6 +6,6 @@
   rotate 30
   compress
   postrotate
-        [ ! -f /var/run/carbon-c-relay/carbon-c-relay.pid ] || /etc/init.d/carbon-c-relay restart
+    [ ! -f /var/run/carbon-c-relay/carbon-c-relay.pid ] || /bin/kill -HUP $(cat /var/run/carbon-c-relay/carbon-c-relay.pid)
   endscript
 }
diff --git a/carbon-c-relay.spec b/carbon-c-relay.spec
index 7d248ca..ec9bf2e 100644
--- a/carbon-c-relay.spec
+++ b/carbon-c-relay.spec
@@ -1,9 +1,10 @@
 %global _hardened_build 1
-%global commit 20076363b928af35357f4a781227dfdc2751979c
+# 0.39 + commits to fix udp sockets
+%global commit a45e94180836ce994f97bbfea16ea105748e61f4
 
 Name:               carbon-c-relay
 Version:            0.39
-Release:            2%{?dist}
+Release:            3%{?dist}
 Summary:            Enhanced C implementation of Carbon relay, aggregator and rewriter
 License:            ASL 2.0
 URL:                https://github.com/grobian/carbon-c-relay
@@ -11,6 +12,7 @@ Source0:            https://github.com/grobian/carbon-c-relay/archive/%{commit}.
 Source1:            carbon-c-relay.service
 Source2:            carbon-c-relay.init
 Source3:            carbon-c-relay.logrotate
+Patch0:             carbon-c-relay-allow-percent.diff
 
 BuildRequires:      openssl-devel
 
@@ -40,6 +42,7 @@ clusters for each and every metric based on pattern matches.
 
 %prep
 %setup -q -n %{name}-%{commit}
+%patch0 -p1
 
 
 %build
@@ -119,6 +122,11 @@ fi
 
 
 %changelog
+* Fri May 01 2015 Piotr Popieluch <piotr1212 at gmail.com> - 0.39-3
+- update to later commit to fix closed udp sockets
+- logrotate sighup instead of restart
+- allow percent characters in metric names
+
 * Thu Apr 02 2015 Piotr Popieluch <piotr1212 at gmail.com> - 0.39-2
 - fix filepath in logrotate
 
diff --git a/sources b/sources
index b71d3c1..8315867 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1961a755c3f39d981bdfef464c35a025  carbon-c-relay-20076363b928af35357f4a781227dfdc2751979c.tar.gz
+244774ca752777eda070e2763575f611  carbon-c-relay-a45e94180836ce994f97bbfea16ea105748e61f4.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/carbon-c-relay.git/commit/?h=f21&id=f6f501a5b693eb03dac1168dbb190f5a3a3708e2