nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 16:26:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix and reformat daily.{sh,php}

Browse Source
This commit is contained in:
f0o
2015-08-03 17:14:33 +00:00
parent 39ce08b62d
commit c83b9a374e
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daily.php
+15 -12
View File
@@ -17,28 +17,31 @@ if ($options['f'] === 'update') {
// The following query is from the excellent mysqltuner.pl by Major Hayden https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl // The following query is from the excellent mysqltuner.pl by Major Hayden https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl
$pool_used = dbFetchCell('SELECT SUM(DATA_LENGTH+INDEX_LENGTH) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ("information_schema", "performance_schema", "mysql") AND ENGINE = "InnoDB" GROUP BY ENGINE ORDER BY ENGINE ASC'); $pool_used = dbFetchCell('SELECT SUM(DATA_LENGTH+INDEX_LENGTH) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ("information_schema", "performance_schema", "mysql") AND ENGINE = "InnoDB" GROUP BY ENGINE ORDER BY ENGINE ASC');
if ($pool_used > $pool_size) { if ($pool_used > $pool_size) {
if (!empty($config['default_mail'])) { if (!empty($config['alert']['default_mail'])) {
$subject = $config['project_name'] . ' auto-update action required'; $subject = $config['project_name'] . ' auto-update action required';
$message = ' $message = '
Hi, Hi,
We have just tried to update your installation but it looks like the InnoDB buffer size is too low. We have just tried to update your installation but it looks like the InnoDB buffer size is too low.
Because of this we have stopped the auto-update running to ensure your system is ok. Because of this we have stopped the auto-update running to ensure your system is ok.
You currently have a configured innodb_buffer_pool_size of ' . $pool_size / 1024 / 1024 / 1024 . 'G but is You currently have a configured innodb_buffer_pool_size of ' . $pool_size / 1024 / 1024 . ' MiB but is currently using ' . $pool_used / 1024 / 1024 . ' MiB
currently using ' . $pool_used / 1024 / 1024 / 1024 . 'G
Take a look at https://dev.mysql.com/doc/refman/5.6/en/innodb-buffer-pool.html for further details. Take a look at https://dev.mysql.com/doc/refman/5.6/en/innodb-buffer-pool.html for further details.
The ' . $config['project_name'] . ' team. The ' . $config['project_name'] . ' team.';
'; send_mail($config['alert']['default_mail'],$subject,$message,$html=false);
send_mail($config['default_mail'],$subject,$message,$html=false); } else {
echo 'InnoDB Buffersize too small.'.PHP_EOL;
echo 'Current size: '.($pool_size / 1024 / 1024).' MiB'.PHP_EOL;
echo 'Minimum Required: '.($pool_used / 1024 / 1024).' MiB'.PHP_EOL;
echo 'To ensure integrity, we\'re not going to pull any updates until the buffersize has been adjusted.'.PHP_EOL;
} }
echo 0; exit(2);
} }
else { else {
echo $config['update']; exit((int) $config['update']);
} }
} }
daily.sh
+2 -1
View File
@@ -4,7 +4,8 @@ set -eu
cd "$(dirname "$0")" cd "$(dirname "$0")"
if [ "$(php daily.php -f update)" -eq 1 ]; then up=$(php daily.php -f update >&2; echo $?)
if [ $up -eq 1 ]; then
git pull --quiet git pull --quiet
php includes/sql-schema/update.php php includes/sql-schema/update.php
fi fi