*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
#include "bacula.h"
#include "dird.h"
-#include "ua.h"
extern char my_name[];
extern time_t daemon_start_time;
}
return 1;
} else {
- store = get_storage_resource(ua, cmd);
+ store = get_storage_resource(ua, 0);
if (store) {
do_storage_status(ua, store);
}
add_prompt(ua, _("Client"));
add_prompt(ua, _("All"));
Dmsg0(20, "do_prompt: select daemon\n");
- if ((item=do_prompt(ua, _("Select daemon type for status"), cmd, MAX_NAME_LENGTH)) < 0) {
+ if ((item=do_prompt(ua, "", _("Select daemon type for status"), cmd, MAX_NAME_LENGTH)) < 0) {
return 1;
}
Dmsg1(20, "item=%d\n", item);
client = NULL;
for (i=0; (client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client)); i++)
{ }
- unique_client = (CLIENT **) malloc(i * sizeof(CLIENT));
+ unique_client = (CLIENT **)malloc(i * sizeof(CLIENT));
/* Find Unique Client address/port */
client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
i = 0;
int pool_mem = FALSE;
Dmsg0(200, "Doing status\n");
- bsendmsg(ua, "%s Version: " VERSION " (" DATE ")\n", my_name);
+ bsendmsg(ua, "%s Version: " VERSION " (" BDATE ")\n", my_name);
bstrftime(dt, sizeof(dt), daemon_start_time);
bsendmsg(ua, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
last_job.NumJobs == 1 ? "" : "s");
case JS_ErrorTerminated:
msg = _("has erred");
break;
- case JS_Cancelled:
+ case JS_Canceled:
msg = _("has been canceled");
break;
case JS_WaitFD:
Mmsg(&msg, _("is waiting on Storage %s"), jcr->store->hdr.name);
pool_mem = TRUE;
break;
+ case JS_WaitStoreRes:
+ msg = _("is waiting on max Storage jobs");
+ break;
+ case JS_WaitClientRes:
+ msg = _("is waiting on max Client jobs");
+ break;
+ case JS_WaitJobRes:
+ msg = _("is waiting on max Job jobs");
+ break;
+ case JS_WaitPriority:
+ msg = _("is waiting for higher priority jobs to finish");
+ break;
+ case JS_WaitMaxJobs:
+ msg = _("is waiting on max total jobs");
+ break;
+ case JS_WaitStartTime:
+ msg = _("is waiting for its start time");
+ break;
+
+
default:
msg = (char *) get_pool_memory(PM_FNAME);
Mmsg(&msg, _("is in unknown state %c"), jcr->JobStatus);
if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) {
bsendmsg(ua, _("\nFailed to connect to Storage daemon %s.\n====\n"),
store->hdr.name);
+ if (ua->jcr->store_bsock) {
+ bnet_close(ua->jcr->store_bsock);
+ ua->jcr->store_bsock = NULL;
+ }
return;
}
Dmsg0(20, _("Connected to storage daemon\n"));
/* Connect to File daemon */
ua->jcr->client = client;
+ /* Release any old dummy key */
+ if (ua->jcr->sd_auth_key) {
+ free(ua->jcr->sd_auth_key);
+ }
+ /* Create a new dummy SD auth key */
+ ua->jcr->sd_auth_key = bstrdup("dummy");
+
/* Try to connect for 15 seconds */
bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
client->hdr.name, client->address, client->FDport);
if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
bsendmsg(ua, _("Failed to connect to Client %s.\n====\n"),
client->hdr.name);
+ if (ua->jcr->file_bsock) {
+ bnet_close(ua->jcr->file_bsock);
+ ua->jcr->file_bsock = NULL;
+ }
return;
}
Dmsg0(20, _("Connected to file daemon\n"));
return;
}
-static void prt_runtime(UAContext *ua, JOB *job, time_t runtime)
+static void prt_runhdr(UAContext *ua)
+{
+ bsendmsg(ua, _("Level Type Scheduled Name\n"));
+ bsendmsg(ua, _("=================================================================\n"));
+}
+
+static void prt_runtime(UAContext *ua, JOB *job, int level, time_t runtime)
{
char dt[MAX_TIME_LENGTH];
bstrftime(dt, sizeof(dt), runtime);
- bsendmsg(ua, _("%s job \"%s\" scheduled for %s\n"),
- job_type_to_str(job->JobType), job->hdr.name, dt);
+ bsendmsg(ua, _("%-14s %-8s %-18s %s\n"),
+ level_to_str(level), job_type_to_str(job->JobType), dt, job->hdr.name);
}
/*
JOB *job;
SCHED *sched;
struct tm tm;
- int mday, wday, month, tmday, twday, tmonth, i, hour;
+ int mday, wday, month, wpos, tmday, twday, tmonth, twpos, i, hour;
int tod, tom;
int found;
+ int hdr_printed = FALSE;
+ int level;
Dmsg0(200, "enter find_runs()\n");
mday = tm.tm_mday - 1;
wday = tm.tm_wday;
month = tm.tm_mon;
+ wpos = (tm.tm_mday - 1) / 7;
tomorrow = now + 60 * 60 * 24;
localtime_r(&tomorrow, &tm);
tmday = tm.tm_mday - 1;
twday = tm.tm_wday;
tmonth = tm.tm_mon;
+ twpos = (tm.tm_mday - 1) / 7;
/* Loop through all jobs */
LockRes();
for (job=NULL; (job=(JOB *)GetNextRes(R_JOB, (RES *)job)); ) {
+ level = job->level;
sched = job->schedule;
if (sched == NULL) { /* scheduled? */
continue; /* no, skip this job */
}
for (run=sched->run; run; run=run->next) {
+ if (run->level) {
+ level = run->level;
+ }
/*
* Find runs in next 24 hours
*/
tod = (bit_is_set(mday, run->mday) || bit_is_set(wday, run->wday)) &&
- bit_is_set(month, run->month);
+ bit_is_set(month, run->month) && bit_is_set(wpos, run->wpos);
tom = (bit_is_set(tmday, run->mday) || bit_is_set(twday, run->wday)) &&
- bit_is_set(tmonth, run->month);
+ bit_is_set(tmonth, run->month) && bit_is_set(wpos, run->wpos);
Dmsg2(200, "tod=%d tom=%d\n", tod, tom);
found = FALSE;
- if (tod) {
+ if (tod) { /* Jobs scheduled today (next 24 hours) */
/* find time (time_t) job is to be run */
localtime_r(&now, &tm);
hour = 0;
tm.tm_sec = 0;
runtime = mktime(&tm);
if (runtime > now) {
- prt_runtime(ua, job, runtime);
+ if (!hdr_printed) {
+ hdr_printed = TRUE;
+ prt_runhdr(ua);
+ }
+ prt_runtime(ua, job, level, runtime);
found = TRUE;
break;
}
}
}
-// Dmsg2(200, "runtime=%d now=%d\n", runtime, now);
- if (!found && tom) {
+// Dmsg2(200, "runtime=%d now=%d\n", runtime, now);
+ if (!found && tom) { /* look at jobs scheduled tomorrow */
localtime_r(&tomorrow, &tm);
hour = 0;
for (i=0; i < 24; i++) {
runtime = mktime(&tm);
Dmsg2(200, "truntime=%d now=%d\n", runtime, now);
if (runtime < tomorrow) {
- prt_runtime(ua, job, runtime);
+ if (!hdr_printed) {
+ hdr_printed = TRUE;
+ prt_runhdr(ua);
+ }
+ prt_runtime(ua, job, level, runtime);
}
}
- }
- }
+ } /* end for loop over runs */
+ } /* end for loop over resources */
UnlockRes();
Dmsg0(200, "Leave find_runs()\n");
}
projects / bacula / bacula / blobdiff