fix multi instance logging name, add restore, fix rcctl (#902)

This commit is contained in:
S.F 2020-11-16 16:18:13 -05:00 committed by GitHub
parent 1c477bc2fc
commit 7addbfc831
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions

View file

@ -1,4 +1,4 @@
# $OpenBSD$
# $OpenBSD: Makefile,v $
COMMENT = fast, cost-effective and scalable time series database
@ -21,17 +21,18 @@ USE_GMAKE = Yes
MODULES = lang/go
MODGO_GOPATH = ${MODGO_WORKSPACE}
SUBST_VARS = VARBASE
do-build:
cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} victoria-metrics-pure
cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmbackup
cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmrestore
do-install:
${INSTALL_PROGRAM} ./pkg/vmlogger.pl ${PREFIX}/bin/vmetricslogger.pl
${INSTALL_PROGRAM} ${WRKSRC}/bin/victoria-metrics-pure ${PREFIX}/bin/vmetrics
${INSTALL_PROGRAM} ${WRKSRC}/bin/vmbackup ${PREFIX}/bin/vmetricsbackup
${INSTALL_PROGRAM} ${WRKSRC}/bin/vmrestore ${PREFIX}/bin/vmetricsrestore
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vmetrics/
${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/vmetrics/
${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/vmetrics/

View file

@ -5,6 +5,7 @@
@rcscript ${RCDIR}/vmetrics
@bin bin/vmetrics
@bin bin/vmetricsbackup
@bin bin/vmetricsrestore
@bin bin/vmetricslogger.pl
share/doc/vmetrics/
share/doc/vmetrics/Articles.md

View file

@ -8,12 +8,14 @@ daemon_user=_vmetrics
. /etc/rc.d/rc.subr
pexp="${daemon}.*"
pexp="${daemon} -loggerDisableTimestamps ${daemon_flags}.*"
rc_bg=YES
rc_reload=NO
me=`basename $0`
rc_start() {
${rcexec} "${daemon} -loggerDisableTimestamps ${daemon_flags} < /dev/null 2>&1 | ${TRUEPREFIX}/bin/vmetricslogger.pl"
${rcexec} "${daemon} -loggerDisableTimestamps ${daemon_flags} < /dev/null 2>&1 | ${TRUEPREFIX}/bin/vmetricslogger.pl $me"
}
rc_cmd $1

View file

@ -1,9 +1,9 @@
#!/usr/bin/perl
use Sys::Syslog qw(:standard :macros);
openlog("victoria-metrics", "pid", "daemon");
openlog($ARGV[0], "pid", "daemon");
while (my $l = <>) {
while (my $l = <STDIN>) {
my @d = split /\t/, $l;
# go level : "INFO", "WARN", "ERROR", "FATAL", "PANIC":
my $lvl = $d[0];