From ff00786e3752efc9a01700e07f99493db0c2dd76 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 14 Dec 2016 18:07:04 +0100
Subject: [PATCH] #167 track test Server players

---
 .../cron/cron_players_online_classic_test.php      |  6 ++++++
 mojotrollz/cron/cron_players_online_tbc_test.php   |  6 ++++++
 mojotrollz/cron/log/PLAYER_COUNT_CLASSIC_TEST.php  |  8 ++++++++
 mojotrollz/cron/log/PLAYER_COUNT_TBC_TEST.php      |  8 ++++++++
 .../sql/qq/ONLINE_PLAYERS.php                      |  8 --------
 .../sql/qq/STATS_CLASSIC.php                       |  5 +++--
 .../sql/qq/STATS_CLASSIC.php                       | 14 --------------
 .../sql/qq/STATS_TBC.php                           | 14 --------------
 .../sql/qq/ONLINE_PLAYERS.php                      |  8 --------
 .../sql/qq/STATS_TBC.php                           |  5 +++--
 mojotrollz/sql/mysql/system_cron.sql               |  4 +++-
 11 files changed, 37 insertions(+), 49 deletions(-)
 create mode 100644 mojotrollz/cron/cron_players_online_classic_test.php
 create mode 100644 mojotrollz/cron/cron_players_online_tbc_test.php
 create mode 100644 mojotrollz/cron/log/PLAYER_COUNT_CLASSIC_TEST.php
 create mode 100644 mojotrollz/cron/log/PLAYER_COUNT_TBC_TEST.php
 delete mode 100644 mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/ONLINE_PLAYERS.php
 delete mode 100644 mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_CLASSIC.php
 delete mode 100644 mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_TBC.php
 delete mode 100644 mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/ONLINE_PLAYERS.php

diff --git a/mojotrollz/cron/cron_players_online_classic_test.php b/mojotrollz/cron/cron_players_online_classic_test.php
new file mode 100644
index 0000000..94f1c3d
--- /dev/null
+++ b/mojotrollz/cron/cron_players_online_classic_test.php
@@ -0,0 +1,6 @@
+<?php
+class cron_players_online_classic_test implements \SYSTEM\CRON\cronjob{
+    public static function run(){ 
+        new \LOG\PLAYER_COUNT_CLASSIC_TEST(\SAI\saimod_mojotrollz_server_handling::online_classic_test());
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/cron/cron_players_online_tbc_test.php b/mojotrollz/cron/cron_players_online_tbc_test.php
new file mode 100644
index 0000000..7dd393a
--- /dev/null
+++ b/mojotrollz/cron/cron_players_online_tbc_test.php
@@ -0,0 +1,6 @@
+<?php
+class cron_players_online_tbc_test implements \SYSTEM\CRON\cronjob{
+    public static function run(){ 
+        new \LOG\PLAYER_COUNT_TBC_TEST(\SAI\saimod_mojotrollz_server_handling::online_tbc_test());
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/cron/log/PLAYER_COUNT_CLASSIC_TEST.php b/mojotrollz/cron/log/PLAYER_COUNT_CLASSIC_TEST.php
new file mode 100644
index 0000000..eb8bd34
--- /dev/null
+++ b/mojotrollz/cron/log/PLAYER_COUNT_CLASSIC_TEST.php
@@ -0,0 +1,8 @@
+<?php
+namespace LOG;
+class PLAYER_COUNT_CLASSIC_TEST extends \SYSTEM\LOG\INFO {
+    public function __construct($count){
+        parent::__construct('WoW Classic Test Players Online: '.$count, $count);
+    }
+}
+    
\ No newline at end of file
diff --git a/mojotrollz/cron/log/PLAYER_COUNT_TBC_TEST.php b/mojotrollz/cron/log/PLAYER_COUNT_TBC_TEST.php
new file mode 100644
index 0000000..61c880f
--- /dev/null
+++ b/mojotrollz/cron/log/PLAYER_COUNT_TBC_TEST.php
@@ -0,0 +1,8 @@
+<?php
+namespace LOG;
+class PLAYER_COUNT_TBC_TEST extends \SYSTEM\LOG\INFO {
+    public function __construct($count){
+        parent::__construct('WoW TBC Test Players Online: '.$count, $count);
+    }
+}
+    
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/ONLINE_PLAYERS.php b/mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/ONLINE_PLAYERS.php
deleted file mode 100644
index d6c9def..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/ONLINE_PLAYERS.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace SQL;
-class ONLINE_PLAYERS extends \SYSTEM\DB\QQ {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return
-'SELECT count(*) as count FROM characters WHERE online = 1 OR at_login = 1;';
-    }
-}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/STATS_CLASSIC.php b/mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/STATS_CLASSIC.php
index 0577414..ef5be0f 100644
--- a/mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/STATS_CLASSIC.php
+++ b/mojotrollz/sai/saimod_mojotrollz_server_classic/sql/qq/STATS_CLASSIC.php
@@ -4,9 +4,10 @@ class STATS_CLASSIC extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
-    .'avg('.\SYSTEM\SQL\system_log::FIELD_CODE.') online'
+    .'avg(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_CLASSIC" then '.\SYSTEM\SQL\system_log::FIELD_CODE.' end) online,'
+    .'avg(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_CLASSIC_TEST" then '.\SYSTEM\SQL\system_log::FIELD_CODE.' end) online_test'
 .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS
-.' WHERE '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_CLASSIC"'
+.' WHERE '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_CLASSIC%"'
 .' GROUP BY day'
 .' ORDER BY day DESC'
 .' LIMIT 30;';
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_CLASSIC.php b/mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_CLASSIC.php
deleted file mode 100644
index 0577414..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_CLASSIC.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace SQL;
-class STATS_CLASSIC extends \SYSTEM\DB\QP {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return 
-'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
-    .'avg('.\SYSTEM\SQL\system_log::FIELD_CODE.') online'
-.' FROM '.\SYSTEM\SQL\system_log::NAME_MYS
-.' WHERE '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_CLASSIC"'
-.' GROUP BY day'
-.' ORDER BY day DESC'
-.' LIMIT 30;';
-    }
-}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_TBC.php b/mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_TBC.php
deleted file mode 100644
index 6e22386..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_server_handling/sql/qq/STATS_TBC.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace SQL;
-class STATS_TBC extends \SYSTEM\DB\QP {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return 
-'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
-    .'avg('.\SYSTEM\SQL\system_log::FIELD_CODE.') online'
-.' FROM '.\SYSTEM\SQL\system_log::NAME_MYS
-.' WHERE '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_TBC"'
-.' GROUP BY day'
-.' ORDER BY day DESC'
-.' LIMIT 30;';
-    }
-}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/ONLINE_PLAYERS.php b/mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/ONLINE_PLAYERS.php
deleted file mode 100644
index d6c9def..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/ONLINE_PLAYERS.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace SQL;
-class ONLINE_PLAYERS extends \SYSTEM\DB\QQ {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return
-'SELECT count(*) as count FROM characters WHERE online = 1 OR at_login = 1;';
-    }
-}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/STATS_TBC.php b/mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/STATS_TBC.php
index 6e22386..c287694 100644
--- a/mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/STATS_TBC.php
+++ b/mojotrollz/sai/saimod_mojotrollz_server_tbc/sql/qq/STATS_TBC.php
@@ -4,9 +4,10 @@ class STATS_TBC extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\SQL\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
-    .'avg('.\SYSTEM\SQL\system_log::FIELD_CODE.') online'
+    .'avg(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_TBC" then '.\SYSTEM\SQL\system_log::FIELD_CODE.' end) online,'
+    .'avg(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_TBC_TEST" then '.\SYSTEM\SQL\system_log::FIELD_CODE.' end) online_test'
 .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS
-.' WHERE '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_TBC"'
+.' WHERE '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE "%PLAYER_COUNT_TBC%"'
 .' GROUP BY day'
 .' ORDER BY day DESC'
 .' LIMIT 30;';
diff --git a/mojotrollz/sql/mysql/system_cron.sql b/mojotrollz/sql/mysql/system_cron.sql
index 4384b0b..38a1a55 100644
--- a/mojotrollz/sql/mysql/system_cron.sql
+++ b/mojotrollz/sql/mysql/system_cron.sql
@@ -1,4 +1,6 @@
 INSERT INTO `system_cron` (`class`, `min`, `hour`, `day`, `day_week`, `month`, `last_run`, `status`) VALUES ('cron_calculate_votes', 0, 0, 1, 0, 0, NULL, 0);
 INSERT INTO `system_cron` (`class`, `min`, `hour`, `day`, `day_week`, `month`, `last_run`, `status`) VALUES ('cron_players_online_ts', NULL, NULL, NULL, NULL, NULL, NULL, 0);
 INSERT INTO `system_cron` (`class`, `min`, `hour`, `day`, `day_week`, `month`, `last_run`, `status`) VALUES ('cron_players_online_tbc', NULL, NULL, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `system_cron` (`class`, `min`, `hour`, `day`, `day_week`, `month`, `last_run`, `status`) VALUES ('cron_players_online_classic', NULL, NULL, NULL, NULL, NULL, NULL, 0);
\ No newline at end of file
+INSERT INTO `system_cron` (`class`, `min`, `hour`, `day`, `day_week`, `month`, `last_run`, `status`) VALUES ('cron_players_online_tbc_test', NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `system_cron` (`class`, `min`, `hour`, `day`, `day_week`, `month`, `last_run`, `status`) VALUES ('cron_players_online_classic', NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `system_cron` (`class`, `min`, `hour`, `day`, `day_week`, `month`, `last_run`, `status`) VALUES ('cron_players_online_classic_test', NULL, NULL, NULL, NULL, NULL, NULL, 0);
\ No newline at end of file