Merge branch 'bugfix/print-iso-date-time-when-lost-connection-10625'

fixes #10625
This commit is contained in:
Alexander A. Klimov 2016-02-22 11:27:01 +01:00
commit eae7a58ad5
2 changed files with 27 additions and 3 deletions

View File

@ -681,11 +681,17 @@
req.addToHistory = false;
} else {
if (this.failureNotice === null) {
var now = new Date();
var padString = this.icinga.utils.padString;
this.failureNotice = this.createNotice(
'error',
'The connection to the Icinga web server was lost at ' +
this.icinga.utils.timeShort() +
'.',
'The connection to the Icinga web server was lost at '
+ now.getFullYear()
+ '-' + padString(now.getMonth() + 1, 0, 2)
+ '-' + padString(now.getDate(), 0, 2)
+ ' ' + padString(now.getHours(), 0, 2)
+ ':' + padString(now.getMinutes(), 0, 2)
+ '.',
true
);

View File

@ -386,6 +386,24 @@
}[c];
}
);
},
/**
* Pad a string with another one
*
* @param {String} str the string to pad
* @param {String} padding the string to use for padding
* @param {Number} minLength the minimum length of the result
*
* @returns {String} the padded string
*/
padString: function(str, padding, minLength) {
str = String(str);
padding = String(padding);
while (str.length < minLength) {
str = padding + str;
}
return str;
}
};