piotrp pushed to carbon-c-relay (f20). "update to upstrem 0.40"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue May 12 06:36:06 UTC 2015


From 5115b139ae40464a0faa713974190841cf5e2195 Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212 at gmail.com>
Date: Tue, 12 May 2015 08:22:58 +0200
Subject: update to upstrem 0.40


diff --git a/.gitignore b/.gitignore
index 91c9637..0153777 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /carbon-c-relay-20076363b928af35357f4a781227dfdc2751979c.tar.gz
 /carbon-c-relay-a45e94180836ce994f97bbfea16ea105748e61f4.tar.gz
+/carbon-c-relay-7f48c2f07e7d24201a50b0529b6d2570a4859021.tar.gz
diff --git a/carbon-c-relay.spec b/carbon-c-relay.spec
index ec9bf2e..cc73454 100644
--- a/carbon-c-relay.spec
+++ b/carbon-c-relay.spec
@@ -1,10 +1,9 @@
 %global _hardened_build 1
-# 0.39 + commits to fix udp sockets
-%global commit a45e94180836ce994f97bbfea16ea105748e61f4
+%global commit 7f48c2f07e7d24201a50b0529b6d2570a4859021
 
 Name:               carbon-c-relay
-Version:            0.39
-Release:            3%{?dist}
+Version:            0.40
+Release:            1%{?dist}
 Summary:            Enhanced C implementation of Carbon relay, aggregator and rewriter
 License:            ASL 2.0
 URL:                https://github.com/grobian/carbon-c-relay
@@ -12,6 +11,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
+Source4:            carbon-c-relay.sysconfig
 Patch0:             carbon-c-relay-allow-percent.diff
 
 BuildRequires:      openssl-devel
@@ -54,6 +54,7 @@ rm -rf %{buildroot}
 install -Dp -m0755 relay %{buildroot}%{_bindir}/carbon-c-relay
 install -Dp -m0644 contrib/relay.conf %{buildroot}%{_sysconfdir}/carbon-c-relay.conf
 install -Dp -m0644 contrib/relay.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/carbon-c-relay
+install -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/carbon-c-relay
 
 %if 0%{?rhel} == 6
 mkdir -p %{buildroot}%{_localstatedir}/log/carbon-c-relay
@@ -122,6 +123,10 @@ fi
 
 
 %changelog
+* Tue May 12 2015 Piotr Popieluch <piotr1212 at gmail.com> - 0.40-1
+- update to upstream 0.40
+- add logfile to sysconfig
+
 * 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
diff --git a/carbon-c-relay.sysconfig b/carbon-c-relay.sysconfig
new file mode 100644
index 0000000..81dedbd
--- /dev/null
+++ b/carbon-c-relay.sysconfig
@@ -0,0 +1,18 @@
+#Usage: relay [-vdst] -f <config> [-p <port>] [-w <workers>] [-b <size>] [-q <size>]
+#
+#Options:
+#  -v  print version and exit
+#  -f  read <config> for clusters and routes
+#  -p  listen on <port> for connections, defaults to 2003
+#  -i  listen on <interface> for connections, defaults to all
+#  -l  write output to <file>, defaults to stdout/stderr
+#  -w  use <workers> worker threads, defaults to 16
+#  -b  server send batch size, defaults to 2500
+#  -q  server queue size, defaults to 25000
+#  -S  statistics sending interval in seconds, defaults to 60
+#  -d  debug mode: currently writes statistics to log
+#  -s  submission mode: write info about errors to log
+#  -t  config test mode: prints rule matches from input on stdin
+#  -H  hostname: override hostname (used in statistics)
+
+ARGS="-p 2003 -w 4 -b 2500 -q 25000 -l /var/log/carbon-c-relay/carbon-c-relay.log"
diff --git a/sources b/sources
index 8315867..b28bb00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-244774ca752777eda070e2763575f611  carbon-c-relay-a45e94180836ce994f97bbfea16ea105748e61f4.tar.gz
+4122c8cb84884e7f738df3e6edbf359d  carbon-c-relay-7f48c2f07e7d24201a50b0529b6d2570a4859021.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/carbon-c-relay.git/commit/?h=f20&id=5115b139ae40464a0faa713974190841cf5e2195


More information about the scm-commits mailing list