Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove trailing whitespace #17

Merged
merged 2 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cerebro.spec.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: @PACKAGE@
Name: @PACKAGE@
Version: @VERSION@
Release: 1

Expand All @@ -9,7 +9,7 @@ Source: @PACKAGE@-@VERSION@.tar.gz

BuildRequires: systemd
Requires: systemd
Requires: /bin/sh
Requires: /bin/sh

%description
Cerebro is a collection of cluster monitoring tools and libraries.
Expand Down Expand Up @@ -123,7 +123,7 @@ Event module to monitor node up/down.
%{?_enable_static_modules} \
%{?_enable_debug} \
--with-systemdsystemunitdir=%{_unitdir}
make
make

%post
# are we upgrading? restart it if running
Expand Down
2 changes: 1 addition & 1 deletion config/ac_boottime.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ AC_DEFUN([AC_BOOTTIME],
MANPAGE_BOOTTIME=0
ac_with_boottime=no
fi

AC_SUBST(MANPAGE_BOOTTIME)
])
8 changes: 4 additions & 4 deletions config/ac_cerebro_config_file.m4
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ AC_DEFUN([AC_CEREBRO_CONFIG_FILE],

AC_MSG_CHECKING([for cerebro config file default path])
AC_ARG_WITH([cerebro-config-file],
AS_HELP_STRING([--with-cerebro-config-file=PATH],
AS_HELP_STRING([--with-cerebro-config-file=PATH],
[Specify default cerebro config file path]),
[ case "$withval" in
no) ;;
yes) ;;
*) CEREBRO_CONFIG_FILE_DEFAULT=$withval
*) CEREBRO_CONFIG_FILE_DEFAULT=$withval
esac
]
)
AC_MSG_RESULT($CEREBRO_CONFIG_FILE_DEFAULT)

AC_DEFINE_UNQUOTED([CEREBRO_CONFIG_FILE_DEFAULT],
["$CEREBRO_CONFIG_FILE_DEFAULT"],
AC_DEFINE_UNQUOTED([CEREBRO_CONFIG_FILE_DEFAULT],
["$CEREBRO_CONFIG_FILE_DEFAULT"],
[Define default cerebro config_file.])
AC_SUBST(CEREBRO_CONFIG_FILE_DEFAULT)
])
4 changes: 2 additions & 2 deletions config/ac_cerebro_metric_control_path.m4
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
AC_DEFUN([AC_CEREBRO_METRIC_CONTROL_PATH],
[
if test "$ac_debug" = "yes"; then
METRIC_CONTROL_PATH="\"/tmp/cerebro_metric_control\""
METRIC_CONTROL_PATH="\"/tmp/cerebro_metric_control\""
else
# Must expand nested unquoting
METRIC_CONTROL_PATH_TMP1="`eval echo ${localstatedir}/run/cerebro_metric_control`"
Expand All @@ -16,7 +16,7 @@ AC_DEFUN([AC_CEREBRO_METRIC_CONTROL_PATH],

AC_MSG_CHECKING([for the metric control path])
AC_ARG_WITH([metric-control-path],
AS_HELP_STRING([--with-metric-control-path],
AS_HELP_STRING([--with-metric-control-path],
[Define metric control path]),
[ case "$withval" in
no) ;;
Expand Down
4 changes: 2 additions & 2 deletions config/ac_cerebro_module_dir.m4
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ AC_DEFUN([AC_CEREBRO_MODULE_DIR],
CEREBRO_MODULE_DIR=${prefix}/$LIBDIRTYPE/cerebro
fi

AC_DEFINE_UNQUOTED([CEREBRO_MODULE_DIR],
["$CEREBRO_MODULE_DIR"],
AC_DEFINE_UNQUOTED([CEREBRO_MODULE_DIR],
["$CEREBRO_MODULE_DIR"],
[Define default cerebro module dir])
AC_SUBST(CEREBRO_MODULE_DIR)
])
4 changes: 2 additions & 2 deletions config/ac_cerebrod_speaker_only.m4
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ AC_DEFUN([AC_CEREBROD_SPEAKER_ONLY],
]
)
AC_MSG_RESULT([${ac_cerebrod_speaker_only_test=no}])

if test "$ac_cerebrod_speaker_only_test" = "yes"; then
AC_DEFINE([WITH_CEREBROD_SPEAKER_ONLY], [1], [Define if you want to build cerebrod with the speaker only])
ac_with_cerebrod_speaker_only=yes
Expand All @@ -37,7 +37,7 @@ AC_DEFUN([AC_CEREBROD_NO_THREADS],
]
)
AC_MSG_RESULT([${ac_cerebrod_no_threads_test=no}])

if test "$ac_with_cerebrod_speaker_only" = "yes" &&
test "$ac_cerebrod_no_threads_test" = "yes"; then
AC_DEFINE([WITH_CEREBROD_NO_THREADS], [1], [Define if you want to build cerebrod with no threads (requires --with-cerebrod-speaker-only)])
Expand Down
4 changes: 2 additions & 2 deletions config/ac_genders.m4
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ AC_DEFUN([AC_GENDERS],
]
)
AC_MSG_RESULT([${ac_genders_test=yes}])

if test "$ac_genders_test" = "yes"; then
AC_CHECK_LIB([genders], [genders_handle_create], [ac_have_genders=yes], [])
fi
Expand All @@ -25,7 +25,7 @@ AC_DEFUN([AC_GENDERS],
GENDERS_LIBS="-lgenders"
MANPAGE_GENDERS=1
ac_with_genders=yes
else
else
MANPAGE_GENDERS=0
ac_with_genders=no
fi
Expand Down
8 changes: 4 additions & 4 deletions config/ac_hostsfile.m4
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ AC_DEFUN([AC_HOSTSFILE],
MANPAGE_HOSTSFILE=0
ac_with_hostsfile=no
fi

AC_SUBST(MANPAGE_HOSTSFILE)
])

Expand All @@ -33,7 +33,7 @@ AC_DEFUN([AC_HOSTSFILE_PATH],

AC_MSG_CHECKING([for default hostsfile path])
AC_ARG_WITH([hostsfile-path],
AS_HELP_STRING([--with-hostsfile-path=PATH],
AS_HELP_STRING([--with-hostsfile-path=PATH],
[Specify default hostsfile clusterlist path]),
[ case "$withval" in
no) ;;
Expand All @@ -44,8 +44,8 @@ AC_DEFUN([AC_HOSTSFILE_PATH],
)
AC_MSG_RESULT($CEREBRO_CLUSTERLIST_HOSTSFILE_DEFAULT)

AC_DEFINE_UNQUOTED([CEREBRO_CLUSTERLIST_HOSTSFILE_DEFAULT],
["$CEREBRO_CLUSTERLIST_HOSTSFILE_DEFAULT"],
AC_DEFINE_UNQUOTED([CEREBRO_CLUSTERLIST_HOSTSFILE_DEFAULT],
["$CEREBRO_CLUSTERLIST_HOSTSFILE_DEFAULT"],
[Define default hostsfile clusterlist.])
AC_SUBST(CEREBRO_CLUSTERLIST_HOSTSFILE_DEFAULT)
])
4 changes: 2 additions & 2 deletions config/ac_ipv6.m4
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
AC_DEFUN([AC_IPV6],
[
# IEEE standard says it should be in sys/socket.h
AC_CHECK_DECL([AF_INET6],
AC_CHECK_DECL([AF_INET6],
AC_DEFINE(HAVE_IPV6,1,[have IPv6]),,
[#include <sys/socket.h>])
[#include <sys/socket.h>])
])
2 changes: 1 addition & 1 deletion config/ac_loadavg.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ AC_DEFUN([AC_LOADAVG],
MANPAGE_LOADAVG=0
ac_with_loadavg=no
fi

AC_SUBST(MANPAGE_LOADAVG)
])
2 changes: 1 addition & 1 deletion config/ac_memory.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ AC_DEFUN([AC_MEMORY],
MANPAGE_MEMORY=0
ac_with_memory=no
fi

AC_SUBST(MANPAGE_MEMORY)
])
2 changes: 1 addition & 1 deletion config/ac_network.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ AC_DEFUN([AC_NETWORK],
MANPAGE_NETWORK=0
ac_with_network=no
fi

AC_SUBST(MANPAGE_NETWORK)
])
2 changes: 1 addition & 1 deletion config/ac_shutdown.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ AC_DEFUN([AC_SHUTDOWN],
MANPAGE_SHUTDOWN=0
ac_with_shutdown=no
fi

AC_SUBST(MANPAGE_SHUTDOWN)
])
6 changes: 3 additions & 3 deletions config/ac_slurm_state.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ AC_DEFUN([AC_SLURM_STATE],
MANPAGE_SLURM_STATE=0
ac_with_slurm_state=no
fi

AC_SUBST(MANPAGE_SLURM_STATE)
])

AC_DEFUN([AC_SLURM_STATE_CONTROL_PATH],
[
if test "$ac_debug" = "yes"; then
SLURM_STATE_CONTROL_PATH="/tmp/cerebro_metric_slurm_state"
SLURM_STATE_CONTROL_PATH="/tmp/cerebro_metric_slurm_state"
else
SLURM_STATE_CONTROL_PATH="$CEREBRO_MODULE_DIR/cerebro_metric_slurm_state"
fi

AC_MSG_CHECKING([for the slurm state control path])
AC_ARG_WITH([slurm-state-control-path],
AS_HELP_STRING([--with-slurm-state-control-path],
AS_HELP_STRING([--with-slurm-state-control-path],
[Define slurm state control path]),
[ case "$withval" in
no) ;;
Expand Down
2 changes: 1 addition & 1 deletion config/ac_static_modules.m4
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ AC_DEFUN([AC_STATIC_MODULES],
if test "$ac_with_static_modules" = "yes"; then
AC_DEFINE([WITH_STATIC_MODULES], [1], [Define if builing with static modules])
MANPAGE_STATIC_MODULES=1
else
else
MANPAGE_STATIC_MODULES=0
fi

Expand Down
8 changes: 4 additions & 4 deletions config/ac_struct_sa_len.m4
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# AC_STRUCT_SA_LEN
#
# DESCRIPTION:
# Check for sa_len variable in struct sockaddr_in
# Check for sa_len variable in struct sockaddr_in
#
# WARNINGS:
# This macro must be placed after AC_PROG_CC or equivalent.
Expand All @@ -18,12 +18,12 @@
AC_DEFUN([AC_STRUCT_SA_LEN],
[
AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_struct_sa_len,
AC_TRY_COMPILE([#include <sys/types.h> #include <sys/socket.h>],
AC_TRY_COMPILE([#include <sys/types.h> #include <sys/socket.h>],
[struct sockaddr s; s.sa_len;],
ac_cv_struct_sa_len=yes,
ac_cv_struct_sa_len=yes,
ac_cv_struct_sa_len=no))

if test $ac_cv_struct_sa_len = yes; then
AC_DEFINE(HAVE_SA_LEN, [1], [do we have sa_len in struct sockaddr])
AC_DEFINE(HAVE_SA_LEN, [1], [do we have sa_len in struct sockaddr])
fi
])
2 changes: 1 addition & 1 deletion config/ac_updown_event.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ AC_DEFUN([AC_UPDOWN],
MANPAGE_UPDOWN=0
ac_with_updown=no
fi

AC_SUBST(MANPAGE_UPDOWN)
])
20 changes: 10 additions & 10 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ AC_CONFIG_HEADERS([config/config.h])
AM_MAINTAINER_MODE

# Update this information before a public release only!

# library versioning
#
# If the library source code has changed at all since the last update,
# then increment c:r: c:r+1:).
# then increment c:r: c:r+1:).
#
# If any interfaces have been added, removed, or changed since the
# last update, increment current, and set revision to 0.
#
# If any interfaces have been added since the last public release,
# then increment age.
#
# If any interfaces have been removed or changed since the last public
# If any interfaces have been removed or changed since the last public
# release, then set age to 0.
#
#
LIBCEREBRO_CURRENT=1
LIBCEREBRO_REVISION=1
LIBCEREBRO_AGE=0
Expand Down Expand Up @@ -166,9 +166,9 @@ AM_CONDITIONAL(WITH_UPDOWN, [test "$ac_with_updown" = "yes"])
# Determine which static module libraries do not need to be linked
# against under a static module build
#
AM_CONDITIONAL(WITH_CLUSTERLIST_STATIC_MODULES,
AM_CONDITIONAL(WITH_CLUSTERLIST_STATIC_MODULES,
[(test "$ac_with_static_modules" = "yes") &&
(test "$ac_with_genders" = "yes" ||
(test "$ac_with_genders" = "yes" ||
test "$ac_with_hostsfile" = "yes")])

# Placeholder, please don't dailywtf me :-)
Expand All @@ -182,10 +182,10 @@ AM_CONDITIONAL(WITH_EVENT_STATIC_MODULES,

AM_CONDITIONAL(WITH_METRIC_STATIC_MODULES,
[(test "$ac_with_static_modules" = "yes") &&
(test "$ac_with_boottime" = "yes" ||
test "$ac_with_loadavg" = "yes" ||
test "$ac_with_memory" = "yes" ||
test "$ac_with_network" = "yes" ||
(test "$ac_with_boottime" = "yes" ||
test "$ac_with_loadavg" = "yes" ||
test "$ac_with_memory" = "yes" ||
test "$ac_with_network" = "yes" ||
test "$ac_with_slurm_state" = "yes")])

# Placeholder, please don't dailywtf me :-)
Expand Down
19 changes: 11 additions & 8 deletions libltdl/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,12 @@ host_triplet = @host@
@CONVENIENCE_LTDL_TRUE@am__append_3 = libltdlc.la
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/../m4/libtool.m4 \
$(top_srcdir)/../m4/ltargz.m4 $(top_srcdir)/../m4/ltdl.m4 \
$(top_srcdir)/../m4/ltoptions.m4 \
$(top_srcdir)/../m4/ltsugar.m4 \
$(top_srcdir)/../m4/ltversion.m4 \
$(top_srcdir)/../m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
Expand Down Expand Up @@ -303,9 +304,11 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \
$(top_srcdir)/../config/install-sh \
$(top_srcdir)/../config/ltmain.sh \
$(top_srcdir)/../config/missing ../config/compile \
../config/config.guess ../config/config.sub ../config/depcomp \
../config/install-sh ../config/ltmain.sh ../config/missing \
COPYING.LIB README lt__argz.c lt__dirent.c lt__strl.c
../config/config.guess ../config/config.sub \
../config/depcomp ../config/install-sh \
../config/ltmain.sh \
../config/missing COPYING.LIB \
README lt__argz.c lt__dirent.c lt__strl.c
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Expand Down
6 changes: 3 additions & 3 deletions man/cerebro-admin.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
.SH "NAME"
cerebro-admin \- cerebro metric administration
.SH "SYNOPSIS"
.B cerebro-admin
.B cerebro-admin
.I "[OPTIONS] -m <metric_name> [-r | -u | -p | -s]"
.br
.SH "DESCRIPTION"
The
.B cerebro-admin
allows administrators to perform metric administration with
a
allows administrators to perform metric administration with
a
.B cerebrod(8)
metric server. New metrics can be registered, unregistered, updated
or resent. A number of the options below allow for alternate metric
Expand Down
12 changes: 6 additions & 6 deletions man/cerebro-stat.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@ system.

The user may specify the
.I "-m"
or
or
.I "-e"
options to retrieve or monitor available metric data and event data.

A number of other options specified below allow for alternate output
formats for the
formats for the
.I "-m"
option.

The
The
.I "-l"
and
and
.I "-z"
can be specified to list available metrics and events respectively.

The default hostname and port used by
The default hostname and port used by
.B cerebro-stat
can be configured using the cerebro configuration file or having a
cerebro configuration loaded. The configuration changes can alter the
Expand All @@ -79,7 +79,7 @@ suite of tools and libraries.
See the
.BR cerebro.conf(5)
and
.BR cerebro_module(3)
.BR cerebro_module(3)
manpages for additional information.

.SH "OPTIONS"
Expand Down
Loading
Loading