![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9646584)
raw | patch | inline | side by side (parent: 9646584)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 2 Aug 2010 13:27:06 +0000 (13:27 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 2 Aug 2010 13:27:06 +0000 (13:27 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19342 594d385d-05f5-0310-b6e9-bd551577e9d8
| gosa-core/include/class_configRegistry.inc | patch | blob | history | |
| gosa-core/include/class_core.inc | patch | blob | history | |
| gosa-core/include/class_stats.inc | patch | blob | history |
diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index ee68d2ed46836ec343471604dde32eb23770a94c..a1ea7b319210ffe2e0878a1b1edebab6902aa707 100644 (file)
return($match);
}
+ static function isWriteableFile($message,$class,$name,$value, $type)
+ {
+ $match = !empty($value) && (is_file($value) || is_writeable($value));
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ if(!is_writeable($value) || !is_file($value)){
+ msg_dialog::display(_("Warning"),
+ sprintf(_("The file '%s' specified for '%s:%s' cannot be used for writing!"),
+ bold($value),bold($class),bold($name)),
+ WARNING_DIALOG);
+ }
+ }
+
+ return($match);
+ }
+
static function isWriteablePath($message,$class,$name,$value, $type)
{
$match = !empty($value)&&is_dir($value)&&is_writeable($value);
index 21a4731270adf4b073cda37fc91eb684e3a1707e..94440a9afbd119718f29d109265776ab95703585 100644 (file)
"group" => "authentification",
"mandatory" => TRUE),
+ array(
+ "name" => "statsDatabaseEnabled",
+ "type" => "bool",
+ "default" => "false",
+ "description" => _("Enables/Disables GOSa usage statistics moduls."),
+ "check" => "gosaProperty::isBool",
+ "migrate" => "",
+ "group" => "core",
+ "mandatory" => TRUE),
+
+ array(
+ "name" => "statsDatabaseFile",
+ "type" => "file",
+ "default" => "/var/spool/gosa/stats",
+ "description" => _("The database file for GOSa usage statistics."),
+ "check" => "gosaProperty::isWriteableFile",
+ "migrate" => "",
+ "group" => "core",
+ "mandatory" => TRUE),
+
array(
"name" => "logging",
"type" => "bool",
index 441166924957ef8bacff39dc15d2193cfdb2a3f2..b64ebe1e4f0cbc146951b8dae0d73c52f30f4e8d 100644 (file)
class stats
{
- static protected $last_cpu_load = "";
- static protected $last_cpu_load_stamp = 0;
+ static protected $lastCpuLoad = "";
+ static protected $lastCpuLoadTimestamp = 0;
+ static protected $tableName = "stats";
+ static protected $tableFile = "/var/spool/gosa/stats";
- static function checkDatabase()
+ static protected $lastHandle = NULL;
+ static protected $statsEnabled = FALSE;
+
+ static function getDatabaseHandle()
{
- $TABLE_NAME = 'stats';
+ // Try to return last valid handle.
+ if(stats::$lastHandle != NULL && is_resource(stats::$lastHandle)){
+ return(stats::$lastHandle);
+ }
+
+ // Check if Logging is enabled
+ global $config;
+ if(!is_object($config) || ! $config instanceOf config){
+ return(NULL);
+ }
- // Check for modules
- // php5-sqlite
+ // Get statsFile property
+ stats::$tableFile = $config->get_cfg_value('core', 'statsDatabaseFile');
+ stats::$statsEnabled = $config->boolValueIsTrue('core', 'statsDatabaseEnabled');
+ if(!stats::$statsEnabled){
+ return;
+ }
+
+ // Check for SQLite extension
+ if(!stats::checkSQLiteExtension()){
+ return(NULL);
+ }
+ // Check if we are able to read/write the given database file.
+ if(!is_writeable(stats::$tableFile)){
+ return(NULL);
+ }
// Try to create database, if it exists just open it.
- $res = sqlite_open('/var/spool/gosa/stats', 0666, $error);
- if(!$res){
- return($res);
+ $handle = sqlite_popen(stats::$tableFile, 0666, $error);
+ if($handle){
+ stats::createDatabaseOnDemand($handle);
}
+ stats::$lastHandle = $handle;
+ return($handle);
+ }
+
+ /*! \brief |
+ * @param |
+ * @return |
+ */
+ static function checkSQLiteExtension()
+ {
+ return(function_exists('sqlite_popen'));
+ }
+
- // Delete Table
+ /*! \brief |
+ * @param |
+ * @return |
+ */
+ static function dropTable($handle)
+ {
+ $TABLE_NAME = stats::$tableName;
$query = "DROP TABLE '{$TABLE_NAME}'";
-# $ret = sqlite_query($query, $res);
+ $ret = sqlite_query($query, $handle);
+ }
+
+
+ /*! \brief |
+ * @param |
+ * @return |
+ */
+ static function get_memory_usage()
+ {
+ return(memory_get_usage());
+ }
+
+
+ /*! \brief |
+ * @param |
+ * @return |
+ */
+ static function get_cpu_load()
+ {
+ $cur = time();
+ if(empty(stats::$lastCpuLoad) || (($cur - stats::$lastCpuLoadTimestamp) >=2 )){
+ list($one, $five, $ten) =preg_split("/ /",shell_exec('cat /proc/loadavg'));
+ stats::$lastCpuLoad = $one;
+ stats::$lastCpuLoadTimestamp = $cur;
+ }
+ return(stats::$lastCpuLoad);
+ }
- // List Tables an check if there is already everything we need.
+
+ /*! \brief |
+ * @param |
+ * @return |
+ */
+ static function createDatabaseOnDemand($handle)
+ {
+ $TABLE_NAME = stats::$tableName;
+
+ // List Tables an check if there is already everything we need,
+ // if not create it.
$query = "SELECT name FROM sqlite_master WHERE type='table' and name='{$TABLE_NAME}'";
- $ret = sqlite_query($query, $res);
+ $ret = sqlite_query($query, $handle);
if(!count(sqlite_fetch_all($ret))){
-
- // Check for table existance
$query = "
CREATE TABLE {$TABLE_NAME} (
ID INTEGER PRIMARY KEY,
CPU_LOAD FLOAT,
INFO BLOB
)";
- $ret = sqlite_query($query, $res);
+ $ret = sqlite_query($query, $handle);
}
-
- return($res);
}
-
+ /*! \brief |
+ * @param |
+ * @return |
+ */
static function log($type, $plugin, $category, $action, $amount = 1, $duration = 0, $info ='')
{
global $config;
global $clicks;
global $overallRenderTimer;
+ // Get database handle, if it is invalid (NULL) return without creating stats
+ $res = stats::getDatabaseHandle();
+ if(!$res) return;
+ // Ensure that 'clicks' and 'overallRenderTimer' are present and set correctly,
+ // if not simply create them with dummy values...
+ // -- 'clicks' is a counter wich is set in main.php -> Number of page reloads
+ // -- 'overallRenderTimer' is set in main.php -> timestamp of rendering start.
if(!isset($clicks) || empty($clicks)) $clicks = 0;
if(!isset($overallRenderTimer) || empty($overallRenderTimer)){
$renderTime = 0;
// Now set the overallRenderTimer to the current timestamp - else
// we will not be able to sum up the render time in a single SQL statement.
$overallRenderTimer = microtime(TRUE);
-
- }
-
- if(is_object($config) && $config instanceOf config){
- $uuid = $config->getGOsaUUID();
- }else{
- $uuid = "";
}
+ // Prepare values to be useable within a database
+ $uuid = $config->getGOsaUUID();
$type = sqlite_escape_string($type);
$plugin = sqlite_escape_string($plugin);
$action = sqlite_escape_string($action);
$memory_usage = sqlite_escape_string(stats::get_memory_usage());
$cpu_load = sqlite_escape_string(stats::get_cpu_load());
+ // Clean up category, which usally comes from acl_category and may still contain
+ // some special chars like /
$tmp = array();
foreach($category as $cat){
$tmp[] = trim($cat, '\/,; ');
}
$category = sqlite_escape_string(implode($tmp, ', '));
-
- $res = stats::checkDatabase();
- $TABLE_NAME = 'stats';
+
+ // Create insert statement.
+ $TABLE_NAME = stats::$tableName;
$query = "
INSERT INTO {$TABLE_NAME}
(ACTID, TYPE, PLUGIN, CATEGORY, ACTION, UUID, MTIMESTAMP, TIMESTAMP,
'{$memory_usage}','{$cpu_load}','{$info}')";
sqlite_query($query, $res);
}
-
- static function get_memory_usage()
- {
- return(memory_get_usage());
- }
-
- static function get_cpu_load()
- {
- $cur = time();
- if(empty(stats::$last_cpu_load) || (($cur - stats::$last_cpu_load_stamp) >=2 )){
- list($one, $five, $ten) =preg_split("/ /",shell_exec('cat /proc/loadavg'));
- stats::$last_cpu_load = $one;
- stats::$last_cpu_load_stamp = $cur;
- }
- return(stats::$last_cpu_load);
- }
-
+
+
+ /*! \brief |
+ * @param |
+ * @return |
+ */
static function show()
{
- $res = stats::checkDatabase();
- $TABLE_NAME = 'stats';
+ $res = stats::getDatabaseHandle();
+ if(!$res) return;
+
+ $TABLE_NAME = stats::$tableName;
$query = "SELECT * FROM {$TABLE_NAME} ORDER BY MTIMESTAMP";
$query = "SELECT PLUGIN, ACTION, MAX(DURATION) as 'DURATION' FROM {$TABLE_NAME} WHERE ACTION='modify' GROUP BY PLUGIN,ACTION ";
$query = "SELECT * FROM {$TABLE_NAME} ORDER BY ID DESC LIMIT 30";