Skip to content

Commit

Permalink
current status
Browse files Browse the repository at this point in the history
  • Loading branch information
@pstorz
pstorz committed Jan 22, 2019
1 parent b81146a commit d4011cd
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 25 deletions.
5 changes: 4 additions & 1 deletion core/CMakeLists.txt
View file
Expand Up @@ -46,7 +46,9 @@ endif()

set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
${PROJECT_SOURCE_DIR}/cmake)
${PROJECT_SOURCE_DIR}/cmake
${PROJECT_SOURCE_DIR}/../cmake
)

SET(host ${CMAKE_SYSTEM})

Expand All @@ -72,6 +74,7 @@ execute_process(
INCLUDE(BareosExtractVersionInfo)
add_definitions(-DVERSION="${BAREOS_FULL_VERSION}")

INCLUDE(BareosLocalBuildDefinitions)

INCLUDE(BareosFindAllLibraries)

Expand Down
8 changes: 4 additions & 4 deletions core/cmake/BareosSetVariableDefaults.cmake
View file
Expand Up @@ -553,12 +553,12 @@ SET(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")

set(ENABLE_NLS 1)

if(DEFINED ENV{SUPPORTSTATUS})
add_definitions(-DSUPPORTSTATUS="$ENV{SUPPORTSTATUS}")
if(DEFINED ENV{BAREOS_VENDORSUPPORT_STATUS})
add_definitions(-DBAREOS_VENDORSUPPORT_STATUS="$ENV{BAREOS_VENDORSUPPORT_STATUS}")
endif()

if(DEFINED ENV{SUPPORTSTATUS_EXPLAINED})
add_definitions(-DSUPPORTSTATUS_EXPLAINED="$ENV{SUPPORTSTATUS_EXPLAINED}")
if(DEFINED ENV{BAREOS_VENDORSUPPORT_MESSAGE})
add_definitions(-DBAREOS_VENDORSUPPORT_MESSAGE="$ENV{BAREOS_VENDORSUPPORT_MESSAGE}")
endif()


Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/admin.cc
View file
Expand Up @@ -126,7 +126,7 @@ void AdminCleanup(JobControlRecord *jcr, int TermCode)
schedt,
sdt,
edt,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);

Dmsg0(debuglevel, "Leave AdminCleanup()\n");
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/archive.cc
View file
Expand Up @@ -125,7 +125,7 @@ void ArchiveCleanup(JobControlRecord *jcr, int TermCode)
schedt,
sdt,
edt,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);

Dmsg0(debuglevel, "Leave ArchiveCleanup()\n");
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/authenticate_console.cc
View file
Expand Up @@ -204,7 +204,7 @@ bool ConsoleAuthenticatorFrom_18_2::SendResponseMessage(uint32_t response_id, bo
bool ConsoleAuthenticatorFrom_18_2::SendInfoMessage()
{
std::string message;
message += BAREOS_SUPPORTSTATUS_BCONSOLE_MESSAGE;
message += BAREOS_VENDORSUPPORT_MESSAGE;
message += "\n";
message += "You are ";
if (ua_->cons) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/backup.cc
View file
Expand Up @@ -1244,7 +1244,7 @@ void GenerateBackupSummary(JobControlRecord *jcr, ClientDbRecord *cr, int msg_ty
edit_uint64_with_suffix(mr.VolBytes, ec8),
daemon_status.c_str(),
secure_erase_status.c_str(),
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);
}
} /* namespace directordaemon */
2 changes: 1 addition & 1 deletion core/src/dird/consolidate.cc
View file
Expand Up @@ -358,7 +358,7 @@ void ConsolidateCleanup(JobControlRecord *jcr, int TermCode)
schedt,
sdt,
edt,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);

Dmsg0(debuglevel, "Leave ConsolidateCleanup()\n");
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/migrate.cc
View file
Expand Up @@ -1750,7 +1750,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord *
edit_uint64_with_suffix(mr->VolBytes, ec5),
jcr->SDErrors,
sd_term_msg,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
term_code);
} else {
/*
Expand All @@ -1776,7 +1776,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord *
edt,
edit_utime(RunTime, elapsed, sizeof(elapsed)),
jcr->JobPriority,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
term_code);
}
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/restore.cc
View file
Expand Up @@ -598,7 +598,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter
edit_uint64_with_commas(jcr->jr.JobBytes, ec3),
(float)kbps,
sd_term_msg,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);
break;
default:
Expand Down Expand Up @@ -649,7 +649,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter
fd_term_msg,
sd_term_msg,
secure_erase_status.c_str(),
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/ua_status.cc
View file
Expand Up @@ -371,7 +371,7 @@ void ListDirStatusHeader(UaContext *ua)
HOST_OS, DISTNAME, DISTVER);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
ua->SendMsg(_("Daemon started %s. Jobs: run=%d, running=%d mode=%d db:%s support:%s\n"),
dt, num_jobs_run, JobCount(), (int)DEVELOPER_MODE, dbdrivers.c_str(), BAREOS_VENDOR_SUPPORT_STATUS );
dt, num_jobs_run, JobCount(), (int)DEVELOPER_MODE, dbdrivers.c_str(), BAREOS_VENDORSUPPORT_STATUS );
ua->SendMsg(_(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
edit_uint64_with_commas(sm_bytes, b2),
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/verify.cc
View file
Expand Up @@ -587,7 +587,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode)
jcr->JobErrors,
fd_term_msg,
sd_term_msg,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);
break;
default:
Expand Down Expand Up @@ -621,7 +621,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode)
edit_uint64_with_commas(jcr->JobFiles, ec1),
jcr->JobErrors,
fd_term_msg,
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/filed/status.cc
View file
Expand Up @@ -91,7 +91,7 @@ static void ListStatusHeader(StatusPacket *sp)
sendit(msg, len, sp);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d support:%s\n"),
dt, num_jobs_run, JobCount(), BAREOS_VENDOR_SUPPORT_STATUS);
dt, num_jobs_run, JobCount(), BAREOS_VENDORSUPPORT_STATUS);
sendit(msg, len, sp);

#if defined(HAVE_WIN32)
Expand Down
10 changes: 5 additions & 5 deletions core/src/include/version.h
View file
Expand Up @@ -5,17 +5,17 @@
#define BDATE "10 January 2019"
#define LSMDATE "10Jan19"

#ifndef BAREOS_VENDOR_SUPPORT_STATUS
#define BAREOS_VENDOR_SUPPORT_STATUS "UNSUPPORTED by vendor."
#ifndef BAREOS_VENDORSUPPORT_STATUS
#define BAREOS_VENDORSUPPORT_STATUS "UNSUPPORTED by vendor."
#endif

#ifndef BAREOS_SUPPORTSTATUS_BCONSOLE_MESSAGE
#define BAREOS_SUPPORTSTATUS_BCONSOLE_MESSAGE "Status: " BAREOS_VENDOR_SUPPORT_STATUS " Visit www.bareos.com for support offerings."
#ifndef BAREOS_VENDORSUPPORT_MESSAGE
#define BAREOS_VENDORSUPPORT_MESSAGE "Status: " BAREOS_VENDORSUPPORT_STATUS " Visit www.bareos.com for support offerings."
#endif


#define PROG_COPYRIGHT "\n" \
BAREOS_SUPPORTSTATUS_BCONSOLE_MESSAGE \
BAREOS_VENDORSUPPORT_MESSAGE \
"\n" \
"Copyright (C) 2013-2019 Bareos GmbH & Co. KG\n" \
"Copyright (C) %d-2012 Free Software Foundation Europe e.V.\n" \
Expand Down
2 changes: 1 addition & 1 deletion core/src/stored/bscan.cc
View file
Expand Up @@ -1441,7 +1441,7 @@ static bool UpdateJobRecord(BareosDb *db, JobDbRecord *jr, SESSION_LABEL *elabel
mjcr->VolSessionId,
mjcr->VolSessionTime,
edit_uint64_with_commas(mr.VolBytes, ec3),
BAREOS_VENDOR_SUPPORT_STATUS,
BAREOS_VENDORSUPPORT_STATUS,
TermMsg);
}
FreeJcr(mjcr);
Expand Down
2 changes: 1 addition & 1 deletion core/src/stored/status.cc
View file
Expand Up @@ -488,7 +488,7 @@ static void ListStatusHeader(StatusPacket *sp)
bstrftime_nc(dt, sizeof(dt), daemon_start_time);

len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d, running=%d, support:%s\n"),
dt, num_jobs_run, JobCount(), BAREOS_VENDOR_SUPPORT_STATUS);
dt, num_jobs_run, JobCount(), BAREOS_VENDORSUPPORT_STATUS);
sendit(msg, len, sp);

#if defined(HAVE_WIN32)
Expand Down

0 comments on commit d4011cd

Please sign in to comment.