- if ((bit_is_set(hour, run->hour) || bit_is_set(next_hour, run->hour)) &&
- (bit_is_set(mday, run->mday) || bit_is_set(wday, run->wday)) &&
- bit_is_set(month, run->month)) {
-
- /* find time (time_t) job is to be run */
- localtime_r(&now, &tm);
- tm.tm_min = run->minute;
- tm.tm_sec = 0;
- if (bit_is_set(hour, run->hour)) {
- runtime = mktime(&tm);
- add_job(job, run, now, runtime);
- }
- if (bit_is_set(next_hour, run->hour)) {
- tm.tm_hour++;
- if (tm.tm_hour > 23) {
- tm.tm_hour = 0;
- }
- runtime = mktime(&tm);
- add_job(job, run, now, runtime);
- }
+#ifdef xxxx
+ Dmsg0(000, "\n");
+ Dmsg6(000, "run h=%d m=%d md=%d wd=%d wom=%d woy=%d\n",
+ hour, month, mday, wday, wom, woy);
+ Dmsg6(000, "bitset bsh=%d bsm=%d bsmd=%d bswd=%d bswom=%d bswoy=%d\n",
+ bit_is_set(hour, run->hour),
+ bit_is_set(month, run->month),
+ bit_is_set(mday, run->mday),
+ bit_is_set(wday, run->wday),
+ bit_is_set(wom, run->wom),
+ bit_is_set(woy, run->woy));
+
+ Dmsg6(000, "nh_run h=%d m=%d md=%d wd=%d wom=%d woy=%d\n",
+ nh_hour, nh_month, nh_mday, nh_wday, nh_wom, nh_woy);
+ Dmsg6(000, "nh_bitset bsh=%d bsm=%d bsmd=%d bswd=%d bswom=%d bswoy=%d\n",
+ bit_is_set(nh_hour, run->hour),
+ bit_is_set(nh_month, run->month),
+ bit_is_set(nh_mday, run->mday),
+ bit_is_set(nh_wday, run->wday),
+ bit_is_set(nh_wom, run->wom),
+ bit_is_set(nh_woy, run->woy));
+#endif
+
+ run_now = bit_is_set(hour, run->hour) &&
+ (bit_is_set(mday, run->mday) || bit_is_set(wday, run->wday)) &&
+ bit_is_set(month, run->month) &&
+ bit_is_set(wom, run->wom) &&
+ bit_is_set(woy, run->woy);
+
+ run_nh = bit_is_set(nh_hour, run->hour) &&
+ (bit_is_set(nh_mday, run->mday) || bit_is_set(nh_wday, run->wday)) &&
+ bit_is_set(nh_month, run->month) &&
+ bit_is_set(nh_wom, run->wom) &&
+ bit_is_set(nh_woy, run->woy);
+
+ Dmsg2(200, "run_now=%d run_nh=%d\n", run_now, run_nh);
+
+ /* find time (time_t) job is to be run */
+ localtime_r(&now, &tm); /* reset tm structure */
+ tm.tm_min = run->minute; /* set run minute */
+ tm.tm_sec = 0; /* zero secs */
+ if (run_now) {
+ runtime = mktime(&tm);
+ add_job(job, run, now, runtime);
+ }
+ /* If job is to be run in the next hour schedule it */
+ if (run_nh) {
+ /* Set correct values */
+ tm.tm_hour = nh_hour;
+ tm.tm_mday = nh_mday + 1; /* fixup because we biased for tests above */
+ tm.tm_mon = nh_month;
+ tm.tm_year = nh_year;
+ runtime = mktime(&tm);
+ add_job(job, run, now, runtime);