diff options
| -rw-r--r-- | core/Profiler.php | 6 | ||||
| -rw-r--r-- | libs/README.md | 4 | ||||
| -rwxr-xr-x | misc/log-analytics/import_logs.py | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/core/Profiler.php b/core/Profiler.php index d4141f472c..0bf0ac966d 100644 --- a/core/Profiler.php +++ b/core/Profiler.php @@ -204,6 +204,9 @@ class Profiler return; } + if(!is_writable(ini_get("xhprof.output_dir"))) { + throw new \Exception("The profiler output dir '" .ini_get("xhprof.output_dir"). "' should exist and be writable."); + } require_once $path; require_once PIWIK_INCLUDE_PATH . '/tests/lib/xhprof-0.9.4/xhprof_lib/utils/xhprof_lib.php'; @@ -230,6 +233,9 @@ class Profiler $xhprofRuns = new \XHProfRuns_Default(); $runId = $xhprofRuns->save_run($xhprofData, $profilerNamespace); + if(empty($runId)) { + die('could not write profiler run'); + } $runs = self::getProfilingRunIds(); $runs[] = $runId; // $weights = array_fill(0, count($runs), 1); diff --git a/libs/README.md b/libs/README.md index 251e5414f7..4705820bc1 100644 --- a/libs/README.md +++ b/libs/README.md @@ -27,8 +27,8 @@ third-party libraries: - in r1296, remove require_once - empty sparklines with floats, off-by-one errors, and locale conflict * tcpdf/ - - in r6786 fixed a notice to avoid Strict Notice when using Imagick #3322 - - in r5540 and r5598, fix a temp file bug when embedding images in PDF + - in 6f945465fe40021d579bc2b4b8876468da69b062 fixed a bug reported in the forums + * Zend/ - strip require_once (to support autoloading) - in r3694, fix ZF-10888 and ZF-10835 diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 64f3738f36..ba8639469c 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -880,7 +880,7 @@ class Piwik(object): try: return json.loads(res) except ValueError: - truncate_after = 700 + truncate_after = 1100 raise urllib2.URLError('Piwik returned an invalid response: ' + res[:truncate_after]) @@ -897,7 +897,7 @@ class Piwik(object): if on_failure is not None: error_message = on_failure(response, kwargs.get('data')) else: - truncate_after = 700 + truncate_after = 1100 truncated_response = (response[:truncate_after] + '..') if len(response) > truncate_after else response error_message = "didn't receive the expected response. Response was %s " % truncated_response |