github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes #787. 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl2SJp0ACgkQTYJo3Gjo
 M53eBQ//SxXlQCJ2/DSFeGqhb4GxJ/9pJsqHSm4BD7c2qBqPK8EcN5i9mGwGs0vd
 RvJemxlGXcIL6NGb3Az21ZbADb065OtSzrH+23yyEATyBl5t9N0HPUdK0uibKaT3
 fwXs7ekQ9Y7eSHEVIqgSnjc7/W9rEG2ljH7HQ/nOaX4tKT6GgY60YZfyeUTlYw43
 zvb1XStYc9RCE+/RY7Ei8HurOPXWui1iNoin2b9C1+46CA8GDQifITA/9CBdBvKU
 1hacA+jsRenX6f8yxfR6LPmD5sbMhyuO+d1GuccCZtqe4yGoR2DOsyr+HeyhFnTL
 Dh2sf5iMXg+ja1N8XNHIceruJEJw+ndmmIwkltHPx6IqkHZsI4KgLIrZg34jt7vm
 JmkmTqYp70TMq32BNliNJzaU4iFCDw5Vr1r1vIuCE/8es/5UuxchNrBS34elJ75L
 l6Hns2wwH1RKYGyZIyIrm7lHBy0f45JnPdeQG7V+nb40Bne+fj8R40rV0HWwHMZv
 nU6FqalAwtxn7+GXDVbtWLgFnHzRCfi9oE281OmzcbRqNeUusPnTJ1D/cC4o8wLA
 JupDJoxqa/3ClA/I3iin/d/5wmQejmsdOKhN0+Fc/BIOE5priRdRuIdjPxzvW8Kn
 v8xktvfPhhEAZiHlcVUhDhHoIc0IlFWy5ZwV8Sh2UCt60m6sOPM=
 =pFGT
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl2SJp0ACgkQTYJo3Gjo
 M50NChAAw6AmU65F2iX13012HNyatNP6U2Pf+zu6944j5WZpmbuagD9jdmdBXWM4
 SA8BIz1AnZUAcXp2gay4B0Flg/9yK7idBSyhpZ+vgBp13oxAk3r+gdH3ytGnyKGJ
 USnrFINyKmQi82Qx4rBtmbAly7XqeyNiJWaE3auysBKixLxfhssydBvhXRIQvlpD
 ytLgaDETUg6w1huWfSusgPlccYT3vBJhQg5AA9M5pXfGZSEohPlpTyyF/l9Td7zg
 jIRhsbIcHqACG7PD4WwfWbkma7kTRjfV8J2HANNdISrcE1N8uc1WqTbMgrW9xouv
 PbcwuO+VAfynBWbtA45JNuzOU8/2gb9o3QNC5TdLN/tAubergz7K2k//du1idA5u
 MQTBXAqiVD5CXSkzaN/3Kp0VPHz2y1CnDYUlRtPlWRPiGiCpl1AtWcA4wm/NfGGa
 jbyDO4Zvt2XHgq010c+f92JTsqyTttWr6tRk/nhcs4/fjONPpz7LHduKqr/HsZuE
 ubX0HRRpEQFYCYeic9Bn17I1OhGJqhcOipmRwrY8uq4rpzLJ8nq0KoYw6te4DSa9
 rHxAuG5PRx1mx19lT1+OZEmxC45E61CRSwFpjFwZGrsj8Ik2tS3ycX704D5tn1kG
 H5s2D9JAk4VlILq6Fu59F0coZnP5NRRnyTu9W+ScSCQise87vsY=
 =Y51m
 -----END PGP SIGNATURE-----

Merge tag 'vundefined-index-787' into develop

Fixes #787.

# gpg: Signature made Mon Sep 30 18:00:29 2019 CEST
# gpg:                using RSA key A1063F1DCFE6981542E4E6AB4D8268DC68E8339D
# gpg: Good signature from "Tim Zandbergen <TimZ99@users.noreply.github.com>" [ultimate]
pull/900/head
TimZ99 2019-09-30 18:00:29 +02:00
parent 86b75c3068 065d7c00f4
commit ee5076a2ac
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@ -6,6 +6,11 @@ Not yet released
---------------- ----------------
\- \-
v3.4.5 (released September 30, 2019)
------------------------------------
* a8eaedc8: Fixed undefined index last_output.
v3.4.4 (released September 26, 2019) v3.4.4 (released September 26, 2019)
------------------------------------ ------------------------------------

3
README.rst
View File

@ -5,8 +5,7 @@ PHP Server Monitor
:alt: Join the chat at https://gitter.im/erickrf/nlpnet :alt: Join the chat at https://gitter.im/erickrf/nlpnet
:target: https://gitter.im/phpservermon/phpservermon :target: https://gitter.im/phpservermon/phpservermon
Version 3.4.4 (Updated design!) Version 3.4.5
PHP Server Monitor is a script that checks whether your websites and servers are up and running. PHP Server Monitor is a script that checks whether your websites and servers are up and running.
It comes with a web based user interface where you can manage your services and websites, It comes with a web based user interface where you can manage your services and websites,

2
docs/conf.py
View File

@ -51,7 +51,7 @@ copyright = u'2008-2017, Pepijn Over'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '3.4.4' version = '3.4.5'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = version

2
src/includes/psmconfig.inc.php
View File

@ -29,7 +29,7 @@
/** /**
* Current PSM version * Current PSM version
*/ */
define('PSM_VERSION', '3.4.4'); define('PSM_VERSION', '3.4.5');
/** /**
* URL to check for updates. Will not be checked if turned off on config page. * URL to check for updates. Will not be checked if turned off on config page.

11
src/psm/Util/Server/Updater/StatusUpdater.php
View File

@ -126,7 +126,7 @@ class StatusUpdater {
// if the server is on, add the last_online value and reset the error threshold counter // if the server is on, add the last_online value and reset the error threshold counter
$save['status'] = 'on'; $save['status'] = 'on';
$save['last_online'] = date('Y-m-d H:i:s'); $save['last_online'] = date('Y-m-d H:i:s');
$save['last_output'] = $this->header; $save['last_output'] = substr($this->header,0,5000);
$save['warning_threshold_counter'] = 0; $save['warning_threshold_counter'] = 0;
if ($this->server['status'] == 'off') { if ($this->server['status'] == 'off') {
$online_date = new \DateTime($save['last_online']); $online_date = new \DateTime($save['last_online']);
@ -152,15 +152,6 @@ class StatusUpdater {
} }
} }
} }
// PATCH Arkhee: fix/last-online-stuck-on-never-if-webpage-too-large
// Updating table "servers" does not work
// Symptom: "Last online" stays stuck on "never"
// Reason: last_output contains the full webpage, too long for the query
// This may depend on mysql configuration on the server_, explaining why some have the problem or not
// Field is 255 Chars, and request does not work anyway is loaded web page is too large in last_output
// Solution: updated column to text and truncate to 5000 characters or less before the query
$save["last_output"] = substr($save["last_output"],0,5000);
// End PATCH
$this->db->save(PSM_DB_PREFIX.'servers', $save, array('server_id' => $this->server_id)); $this->db->save(PSM_DB_PREFIX.'servers', $save, array('server_id' => $this->server_id));
return $this->status_new; return $this->status_new;