Skip to content
This repository has been archived by the owner on May 9, 2018. It is now read-only.

Commit

Permalink
Fixing some compiler warnings and RPM spec file.
Browse files Browse the repository at this point in the history
  • Loading branch information
jbreams committed Jan 4, 2014
1 parent 8d15983 commit c938894
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
AC_INIT([nagmq], [1.4], [[email protected]])
AC_INIT([nagmq], [1.4.1], [[email protected]])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_SRCDIR([mods/nagmq_pub.c])
AC_CONFIG_HEADERS([mods/config.h dnxmq/config.h])
Expand Down
6 changes: 3 additions & 3 deletions mods/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ void * zap_handler(void* zapsock) {
struct keybaghash bag;
bag.buckets = 63;
bag.data = calloc(63, sizeof(struct keybag*));
bag.count;
bag.count = 0;
time_t last_refresh = 0;
int keeprunning = 1, i;
sigset_t sigset;
Expand Down Expand Up @@ -501,7 +501,7 @@ void * zap_handler(void* zapsock) {
rc = zmq_msg_recv(&curmsg, zapsock, 0);
if(rc == -1) {
if(errno == ETERM) {
keeprunning == 0;
keeprunning = 0;
break;
}
else
Expand Down Expand Up @@ -587,7 +587,7 @@ int handle_startup(int which, void * obj) {
*reqdef = NULL, *curvedef = NULL;
int numthreads = 1;

syslog(LOG_INFO, "Initializing NagMQ %lu", getpid());
syslog(LOG_INFO, "Initializing NagMQ %u", getpid());
if(get_values(config,
"iothreads", JSON_INTEGER, 0, &numthreads,
"publish", JSON_OBJECT, 0, &pubdef,
Expand Down
11 changes: 5 additions & 6 deletions nagmq.spec
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Name: nagmq
Version: 1.4
Version: 1.4.1
Release: 1%{?dist}
Summary: NagMQ is an event broker that exposes the internal state and events of Nagios
Group: Utilities/Monitoring
License: GPL
Url: https://github.com/jbreams/nagmq
Source0: %{sourcedir}/nagmq-%{version}.tar.gz
Packager: Daniel Wittenberg <dwittenberg2008@gmail.com>
Packager: Jonathan Reams <jbreams@gmail.com>
Vendor: Jonathan Reams <[email protected]>
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zeromq3-devel libev-devel jansson-devel
Requires: zeromq3 libev jansson
BuildRequires: zeromq-devel libev-devel jansson-devel
Requires: zeromq libev jansson

%description
NagMQ is an event broker that exposes the internal state and events of Nagios to endpoings on a ZeroMQ message bus.
Expand All @@ -37,7 +37,7 @@ NagMQ client package
%setup -q

%build
%configure
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
Expand All @@ -49,7 +49,6 @@ NagMQ client package
%{__cp} -a dnxmq/mqexec.init ${RPM_BUILD_ROOT}/%{_initrddir}/mqexec
%{__cp} -a dnxmq/mqbroker.init ${RPM_BUILD_ROOT}/%{_initrddir}/mqbroker
%{__rm} ${RPM_BUILD_ROOT}%{_libdir}/nagmq/nagmq.so.0*
%{__rm} ${RPM_BUILD_ROOT}%{_libdir}/nagmq/nagmq.a
%{__rm} ${RPM_BUILD_ROOT}%{_libdir}/nagmq/nagmq.la

%files
Expand Down

0 comments on commit c938894

Please sign in to comment.