aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-07-21 21:41:31 +0000
committerplegall <plg@piwigo.org>2009-07-21 21:41:31 +0000
commit641caaa2f57fc37081c19be9d80dad323286f849 (patch)
tree75d2a36b1ac2f0b8ce32090551ecad443ab69860
parentb253200c95444448b2a62239dccca6d285f967fa (diff)
merge r3661 from branch 2.0 to trunk
feature 1071: improve log system on API calls. The log can be activated by a configuration setting. The log file can be changed also with a configuration setting. improvement: pwg.images.add API methods gets a cleaner way to log received parameters. git-svn-id: http://piwigo.org/svn/trunk@3662 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/config_default.inc.php6
-rw-r--r--include/ws_functions.inc.php34
2 files changed, 21 insertions, 19 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 5857d7fa1..27648fd0f 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -654,6 +654,12 @@ $conf['enable_plugins']=true;
// Web services are allowed (true) or completely forbidden (false)
$conf['allow_web_services'] = true;
+// enable log for web services
+$conf['ws_enable_log'] = false;
+
+// web services log file path
+$conf['ws_log_filepath'] = '/tmp/piwigo_ws.log';
+
// Maximum number of images to be returned foreach call to the web service
$conf['ws_max_images_per_page'] = 500;
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index dece797d6..591763d5b 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -990,19 +990,15 @@ function ws_images_add($params, &$service)
return new PwgError(401, 'Access denied');
}
- // name
- // category_id
- // file_content
- // file_sum
- // thumbnail_content
- // thumbnail_sum
- // rank
-
- // $fh_log = fopen('/tmp/php.log', 'w');
- // fwrite($fh_log, time()."\n");
- // fwrite($fh_log, 'input rank :'.$params['rank']."\n");
- // fwrite($fh_log, 'input: '.$params['file_sum']."\n");
- // fwrite($fh_log, 'input: '.$params['thumbnail_sum']."\n");
+ foreach ($params as $param_key => $param_value) {
+ ws_logfile(
+ sprintf(
+ '[pwg.images.add] input param "%s" : "%s"',
+ $param_key,
+ is_null($param_value) ? 'NULL' : $param_value
+ )
+ );
+ }
// does the image already exists ?
$query = '
@@ -1028,8 +1024,6 @@ SELECT
$day
);
- //fwrite($fh_log, $upload_dir."\n");
-
// create the upload directory tree if not exists
if (!is_dir($upload_dir)) {
umask(0000);
@@ -1223,8 +1217,6 @@ SELECT
}
invalidate_user_cache();
-
- // fclose($fh_log);
}
/**
@@ -1790,10 +1782,14 @@ function ws_categories_setInfo($params, &$service)
function ws_logfile($string)
{
- return true;
+ global $conf;
+
+ if (!$conf['ws_enable_log']) {
+ return true;
+ }
file_put_contents(
- '/tmp/piwigo_ws.log',
+ $conf['ws_log_filepath'],
'['.date('c').'] '.$string."\n",
FILE_APPEND
);