Author: fapeeler
Date: Thu Jul 21 20:38:53 2016
New Revision: 1753735
URL: http://svn.apache.org/viewvc?rev=1753735&view=rev
Log:
VCL-975
Added variable for collecting general_end_notice_second
updated conditional related to the hardcoded values mentioned in the jira issue
Modified:
vcl/trunk/managementnode/lib/VCL/inuse.pm
Modified: vcl/trunk/managementnode/lib/VCL/inuse.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/inuse.pm?rev=1753735&r1=1753734&r2=1753735&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/inuse.pm Thu Jul 21 20:38:53 2016
@@ -161,6 +161,8 @@ sub process {
my $end_time_notify_seconds =
$self->os->get_timings('general_end_notice_first');
my $end_time_notify_minutes = floor($end_time_notify_seconds / 60);
+ my $second_end_time_notify_seconds =
$self->os->get_timings('general_end_notice_second');
+ my $second_end_time_notify_minutes =
floor($second_end_time_notify_seconds / 60);
my $now_string = strftime('%H:%M:%S',
localtime($now_epoch_seconds));
my $request_end_string = strftime('%H:%M:%S',
localtime($request_end_epoch_seconds));
@@ -222,7 +224,7 @@ sub process {
}
# Notify user when 5 or 10 minutes remain
- if ($request_remaining_minutes == 5 ||
$request_remaining_minutes == 10) {
+ if ($request_remaining_minutes ==
$second_end_time_notify_minutes || $request_remaining_minutes ==
$end_time_notify_minutes) {
$self->notify_user_endtime_imminent("$request_remaining_minutes minutes");
}
