sort log files by severity in churn page; test cluster db with custom…

… class names; better storage log msg if no data found
gggeek · Feb 20, 2022 · 18a82a5 · 18a82a5
1 parent a1ed8e0
commit 18a82a5
Show file tree

Hide file tree

Showing 34 changed files with 82 additions and 48 deletions.
diff --git a/classes/ezsysinfoclustermanager.php b/classes/ezsysinfoclustermanager.php
@@ -26,7 +26,7 @@ static public function clusterDBHandler()
         {
             return eZClusterFileHandler::instance();
         }
-        else if ( $handler == 'eZDFSFileHandler' )
+        else if ( $handler == 'eZDFSFileHandler' || strpos( $handler, 'DFSFileHandler' ) !== false )
         {
             // This is even worse: we have no right to know if db connection is ok.
             // So we replicate some code here...
@@ -50,7 +50,7 @@ static public function clusterFileStorageDir()
     {
         $ini = eZINI::instance( 'file.ini' );
         $handler = $ini->variable( 'ClusteringSettings', 'FileHandler' );
-        if ( $handler == 'eZDFSFileHandler' )
+        if ( $handler == 'eZDFSFileHandler' || strpos( $handler, 'DFSFileHandler' ) !== false )
         {
             return $ini->variable( 'eZDFSClusteringSettings', 'MountPointPath' );
         }

diff --git a/classes/inichecker.php b/classes/inichecker.php
@@ -50,9 +50,8 @@ static function checkFileNames()
 
         // starting with version 4.4, it is not necessary to have exactly one .ini
         // file (and optionally many .ini.append.php)
-        if ( version_compare( '4.4', eZPublishSDK::version() ) <= 0 )
+        if ( version_compare( '4.4', eZPublishSDK::version() ) >= 0 )
         {
-
             // .ini files in extensions that have same name as std files, no .ini (master) file for new ones
             $newinis = array();
             $changedinis = array();

diff --git a/classes/statustests/sysinfotests.php b/classes/statustests/sysinfotests.php
@@ -32,6 +32,7 @@ public static function runTests()
         }
 
         $clusterDBHandler = ezSysinfoClusterManager::clusterDBHandler();
+
         if ( $clusterDBHandler instanceof eZDBFileHandler )
         {
             // warning - we dig into the private parts of the cluster file handler,

diff --git a/design/standard/templates/sysinfo/cachesearch.tpl b/design/standard/templates/sysinfo/cachesearch.tpl
@@ -107,7 +107,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/cachestats.tpl b/design/standard/templates/sysinfo/cachestats.tpl
@@ -72,6 +72,7 @@
 
 <p><b>NB:</b> {'Symfony cache stats are reliable only when using a standard configuration'|i18n( 'SysInfo' )}</p>
 
+{* @todo add support for customized dfs class names *}
 {if eq( ezini( 'ClusteringSettings', 'FileHandler', 'file.ini' ), 'eZDFSFileHandler')}
     <p><b>NB:</b> {'"DFS://" stats refer to files found on the shared storage, not to what is recorded in the cluster database'|i18n( 'SysInfo' )}</p>
 {/if}
@@ -103,7 +104,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/classesreport.tpl b/design/standard/templates/sysinfo/classesreport.tpl
@@ -80,7 +80,7 @@
 </div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/clustermasterview.tpl b/design/standard/templates/sysinfo/clustermasterview.tpl
@@ -45,7 +45,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/contentstats.tpl b/design/standard/templates/sysinfo/contentstats.tpl
@@ -89,7 +89,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/databaseqa.tpl b/design/standard/templates/sysinfo/databaseqa.tpl
@@ -32,11 +32,12 @@
 
 </div>
 
+<hr/>
 See also the <a href={'setup/systemupgrade'|ezurl}>Database Consistency Check</a> page for more tests
 
 {* DESIGN: Content END *}</div></div></div></div></div></div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/eventtypelist.tpl b/design/standard/templates/sysinfo/eventtypelist.tpl
@@ -137,7 +137,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/fetchlist.tpl b/design/standard/templates/sysinfo/fetchlist.tpl
@@ -124,7 +124,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/info.tpl b/design/standard/templates/sysinfo/info.tpl
@@ -27,7 +27,7 @@
 
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/inireport.tpl b/design/standard/templates/sysinfo/inireport.tpl
@@ -63,7 +63,7 @@
 </div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/logchurn.tpl b/design/standard/templates/sysinfo/logchurn.tpl
@@ -28,7 +28,7 @@
 {* DESIGN: Content END *}</div></div></div></div></div></div>
 {* DESIGN: Content END *}{*</div></div></div>*}
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/logstats.tpl b/design/standard/templates/sysinfo/logstats.tpl
@@ -107,7 +107,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/logview.tpl b/design/standard/templates/sysinfo/logview.tpl
@@ -109,7 +109,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/modulelist.tpl b/design/standard/templates/sysinfo/modulelist.tpl
@@ -128,7 +128,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/mysqli.tpl b/design/standard/templates/sysinfo/mysqli.tpl
@@ -38,7 +38,7 @@
 
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/operationlist.tpl b/design/standard/templates/sysinfo/operationlist.tpl
@@ -115,7 +115,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/operatorlist.tpl b/design/standard/templates/sysinfo/operatorlist.tpl
@@ -116,7 +116,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/policiesreport.tpl b/design/standard/templates/sysinfo/policiesreport.tpl
@@ -87,7 +87,7 @@
 </div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/policylist.tpl b/design/standard/templates/sysinfo/policylist.tpl
@@ -104,7 +104,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/realpath.tpl b/design/standard/templates/sysinfo/realpath.tpl
@@ -88,7 +88,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/secinfo.tpl b/design/standard/templates/sysinfo/secinfo.tpl
@@ -119,7 +119,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/solrdetails.tpl b/design/standard/templates/sysinfo/solrdetails.tpl
@@ -85,7 +85,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/sourcerevision.tpl b/design/standard/templates/sysinfo/sourcerevision.tpl
@@ -59,7 +59,7 @@
 
 {* DESIGN: Content END *}</div></div></div></div></div></div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/storagechurn.tpl b/design/standard/templates/sysinfo/storagechurn.tpl
@@ -15,13 +15,13 @@
     {$errormsg}
 {else}
 <div class="block">
-<img src="{concat(ezroot('no'),$graphsource)}" alt="{$title|i18n('SysInfo')}" />
+    <img src="{concat(ezroot('no'),$graphsource)}" alt="{$title|i18n('SysInfo')}" />
 </div>
 {/if}
 
 {* DESIGN: Content END *}</div></div></div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/systemcheck.tpl b/design/standard/templates/sysinfo/systemcheck.tpl
@@ -33,7 +33,7 @@
 
 {* DESIGN: Content END *}</div></div></div></div></div></div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/design/standard/templates/sysinfo/systemstatus.tpl b/design/standard/templates/sysinfo/systemstatus.tpl
@@ -74,6 +74,7 @@
 {/foreach}
 </table>
 
+<hr/>
 {if $ezsnmpd_available}
     See also the <a href={'snmp/mib/html'|ezurl}>eZSNMPd extension</a> for more status tests
 {else}
@@ -107,7 +108,7 @@
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 </div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>

diff --git a/design/standard/templates/sysinfo/table.tpl b/design/standard/templates/sysinfo/table.tpl
@@ -40,7 +40,7 @@
 
 {* DESIGN: Control bar END *}</div></div></div></div></div></div>
 
-<hr>
+<hr/>
 {def $timestamp=currentdate()}
 Host: {$hostname|wash}; date: {$timestamp|l10n( 'shortdatetime' )}
 </div>
diff --git a/doc/changelogs/CHANGELOG-0.9.17-to-0.10.0 b/doc/changelogs/CHANGELOG-0.9.17-to-0.10.0
@@ -0,0 +1,22 @@
+Changes from 0.9.17 to 0.10.0 - released 2022-2-20
+
+Improved: current hostname and date are displayed at the bottom of every page, helping especially in case of cluster setups
+
+New: its is now possible to specify the size for churn graphs (Height, Width) via ini settings
+
+Improved: the churn graphs do display dates in X axis for long time spans instead of just times
+
+Improved: the `Log churn` file list logs by decreasing severity
+
+Improved: the churn graphs are cached separately for each server when running in cluster mode and no having set up
+  the bundle for cluster configuration
+
+Improved: cluster db connection is now tested if the FileHandler in ClusteringSettings was changed, and its name contains the string `DFSFileHandler`
+
+Improved: in the security checks, recommend php version 7.4 instead of 5.6
+
+Improved: in the ini files checks, do not verify for one .ini and many .ini.append.php for eZP > 4.4
+
+Fixed: clearing the churn graphs when clearing eZ caches did not work
+
+Fixed: do not report mysql utf8mb4 tables as having a bad character set
diff --git a/modules/sysinfo/lib/PhpSecInfo/Test/Core/php_version.php b/modules/sysinfo/lib/PhpSecInfo/Test/Core/php_version.php
@@ -28,7 +28,7 @@ class PhpSecInfo_Test_Core_Php_Version extends PhpSecInfo_Test_Core
 	function _retrieveCurrentValue() {
 		$this->current_value = PHP_VERSION;
 
-		$url = 'http://php.net/releases/?serialize=1&version=5';
+		$url = 'http://php.net/releases/?serialize=1&version=7';
 		try {
 		    $latestVersion = eZHTTPTool::getDataByURL( $url );
 			$versionInfo = unserialize( $latestVersion );

diff --git a/modules/sysinfo/logchurn.php b/modules/sysinfo/logchurn.php
@@ -10,7 +10,6 @@
  * @todo add support for a fixed timespan, eg 'last N seconds'
  * @todo support coarser intervals than 60 secs
  * @todo add support for not showing older (rotated) logs
- * @todo sort logs by severity
  * @todo use a line graph and coalesce logs together
  */
 
@@ -38,10 +37,19 @@
 
 // nb: this dir is calculated the same way as ezlog does
 $debug = eZDebug::instance();
-$logfiles = $debug->logFiles();
+
+// sort logfiles according to severity
+$logfiles = array( 'error.log' => null, 'warning.log' => null, 'debug.log' => null, 'notice.log' => null, 'strict.log' => null);
+foreach( $debug->logFiles() as $item ) {
+    $logfiles[$item[1]] = $item;
+}
 
 foreach( $logfiles as $level => $file )
 {
+    if ($file == null) {
+        continue;
+    }
+
     $logfile = $file[0] . $file[1];
     $logname = str_replace( '.log', '', $file[1] );
     $cachefiles[$logname] = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ public static function runTests() @@
             }
             $clusterDBHandler = ezSysinfoClusterManager::clusterDBHandler();
             if ( $clusterDBHandler instanceof eZDBFileHandler )
             {
                 // warning - we dig into the private parts of the cluster file handler,
@@ Expand Down @@