Commit ca73b68c authored by Aleksandr Konstantinov's avatar Aleksandr Konstantinov
Browse files

Merge branch 'slowdown_hunting' into 'master'

Finish log splitting for split a-rex and a-rex-ws services. Fixes BUGZ-4030

See merge request nordugrid/arc!1236
parents 3395299b 055b6a25
#
# Logs written by A-REX WS interface
#
/var/log/arc/ws-interface.log
{
missingok
compress
delaycompress
daily
rotate 14
create
sharedscripts
postrotate
kill -HUP `cat /run/arched-arex-ws.pid 2> /dev/null` 2> /dev/null || true
endscript
}
......@@ -4,7 +4,6 @@
/var/log/arc/arex.log
/var/log/arc/arex-jobs.log
/var/log/arc/job.helper.errors
/var/log/arc/ws-interface.log
/var/log/arc/datastaging.log
{
missingok
......
......@@ -1040,6 +1040,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -p -m 644 debian/%{name}-arex.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-arex
install -p -m 644 debian/%{name}-arex-ws.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-arex-ws
install -p -m 644 debian/%{name}-gridftpd.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-gridftpd
%if %{with_ldap_service}
......@@ -1505,6 +1507,7 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%doc %{_mandir}/man8/arc-blahp-logger.8*
%doc %{_mandir}/man8/a-rex-backtrace-collect.8*
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-arex
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-arex-ws
%dir %{_localstatedir}/log/arc
%dir %{_localstatedir}/spool/arc
%dir %{_localstatedir}/spool/arc/ssm
......
......@@ -245,9 +245,6 @@ prepare() {
WSLOGFILE=`readconfigvar "$ARC_RUNTIME_CONFIG" logfile arex/ws`
arex_mount_point=`readconfigvar "$ARC_RUNTIME_CONFIG" wsurl arex/ws`
arex_endpoint="<arex:endpoint>$arex_mount_point</arex:endpoint>"
mkdir_for_user `dirname "$WSLOGFILE"` "$USERNAME" "$GROUPNAME"
mkfile_for_user "$WSLOGFILE" "$USERNAME" "$GROUPNAME"
fi
service_mail=""
......
......@@ -428,9 +428,6 @@ prepare() {
*) LOGLEVEL="INFO" ;;
esac
mkdir_for_user `dirname "$LOGFILE"` "$USERNAME" "$GROUPNAME"
mkfile_for_user "$LOGFILE" "$USERNAME" "$GROUPNAME"
if [ "$WATCHDOG" = "yes" ] ; then
WATCHDOG="true"
else
......@@ -491,7 +488,6 @@ prepare() {
<Server>
<PidFile>$PID_FILE</PidFile>
<Logger>
<File>$LOGFILE</File>
<File>$WSLOGFILE</File>
<Level>$LOGLEVEL</Level>
</Logger>
......@@ -556,7 +552,6 @@ prepare() {
<Server>
<PidFile>$PID_FILE</PidFile>
<Logger>
<File>$LOGFILE</File>
<File>$WSLOGFILE</File>
<Level>$LOGLEVEL</Level>
</Logger>
......@@ -662,8 +657,8 @@ fi
prepare
echo "Validating A-REX setup..." >> "$LOGFILE"
validate >> "$LOGFILE" 2>&1
echo "Validating A-REX setup..." >> "$WSLOGFILE"
validate >> "$WSLOGFILE" 2>&1
RETVAL=$?
if [ $RETVAL != 0 ]; then
# Run validator again to print errors to stdout
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment