diff options
Diffstat (limited to 'core/src/stored/dev.cc')
| -rw-r--r-- | core/src/stored/dev.cc | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/core/src/stored/dev.cc b/core/src/stored/dev.cc index f5374c1ca..5070c0bec 100644 --- a/core/src/stored/dev.cc +++ b/core/src/stored/dev.cc @@ -76,7 +76,7 @@ #include "stored/autochanger.h" #include "stored/bsr.h" #include "stored/device_control_record.h" -#include "stored/jcr_private.h" +#include "stored/stored_jcr_impl.h" #include "stored/sd_backends.h" #include "lib/btimers.h" #include "include/jcr.h" @@ -311,27 +311,29 @@ void InitDeviceWaitTimers(DeviceControlRecord* dcr) dev->num_wait = 0; dev->poll = false; - jcr->impl->device_wait_times.min_wait = 60 * 60; - jcr->impl->device_wait_times.max_wait = 24 * 60 * 60; - jcr->impl->device_wait_times.max_num_wait + jcr->sd_impl->device_wait_times.min_wait = 60 * 60; + jcr->sd_impl->device_wait_times.max_wait = 24 * 60 * 60; + jcr->sd_impl->device_wait_times.max_num_wait = 9; /* 5 waits =~ 1 day, then 1 day at a time */ - jcr->impl->device_wait_times.wait_sec = jcr->impl->device_wait_times.min_wait; - jcr->impl->device_wait_times.rem_wait_sec - = jcr->impl->device_wait_times.wait_sec; - jcr->impl->device_wait_times.num_wait = 0; + jcr->sd_impl->device_wait_times.wait_sec + = jcr->sd_impl->device_wait_times.min_wait; + jcr->sd_impl->device_wait_times.rem_wait_sec + = jcr->sd_impl->device_wait_times.wait_sec; + jcr->sd_impl->device_wait_times.num_wait = 0; } void InitJcrDeviceWaitTimers(JobControlRecord* jcr) { /* ******FIXME******* put these on config variables */ - jcr->impl->device_wait_times.min_wait = 60 * 60; - jcr->impl->device_wait_times.max_wait = 24 * 60 * 60; - jcr->impl->device_wait_times.max_num_wait + jcr->sd_impl->device_wait_times.min_wait = 60 * 60; + jcr->sd_impl->device_wait_times.max_wait = 24 * 60 * 60; + jcr->sd_impl->device_wait_times.max_num_wait = 9; /* 5 waits =~ 1 day, then 1 day at a time */ - jcr->impl->device_wait_times.wait_sec = jcr->impl->device_wait_times.min_wait; - jcr->impl->device_wait_times.rem_wait_sec - = jcr->impl->device_wait_times.wait_sec; - jcr->impl->device_wait_times.num_wait = 0; + jcr->sd_impl->device_wait_times.wait_sec + = jcr->sd_impl->device_wait_times.min_wait; + jcr->sd_impl->device_wait_times.rem_wait_sec + = jcr->sd_impl->device_wait_times.wait_sec; + jcr->sd_impl->device_wait_times.num_wait = 0; } /** |