diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2024-10-01 14:54:29 +0000 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2024-10-01 14:54:29 +0000 |
| commit | df33ddaea1e46b5b923440d6383fa3ae85c4d60b (patch) | |
| tree | 89c510638669466453c7451f5eb493f50e850de0 /public.php | |
| parent | 8fcc68baf5b0ff964a0a4a045353462586e0e316 (diff) | |
| parent | 7e0f5f295c0480023098edca5e3f5a806bd93bab (diff) | |
Merge branch 'drop-opentelemetry' into 'master'
drop opentelemetry
See merge request tt-rss/tt-rss!68
Diffstat (limited to 'public.php')
| -rw-r--r-- | public.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/public.php b/public.php index a0f06b436..06bc9882c 100644 --- a/public.php +++ b/public.php @@ -11,8 +11,6 @@ if (!init_plugins()) return; - $span = OpenTelemetry\API\Trace\Span::getCurrent(); - $method = (string)clean($_REQUEST["op"]); // shortcut syntax for public (exposed) methods (?op=plugin--pmethod&...params) @@ -38,34 +36,30 @@ user_error("Refusing to invoke method $method which starts with underscore.", E_USER_WARNING); header("Content-Type: text/json"); print Errors::to_json(Errors::E_UNAUTHORIZED); - $span->setAttribute('error', Errors::E_UNAUTHORIZED); + return; } if (implements_interface($handler, "IHandler") && $handler->before($method)) { - $span->addEvent("construct/$method"); + if ($method && method_exists($handler, $method)) { $reflection = new ReflectionMethod($handler, $method); if ($reflection->getNumberOfRequiredParameters() == 0) { - $span->addEvent("invoke/$method"); $handler->$method(); } else { user_error("Refusing to invoke method $method which has required parameters.", E_USER_WARNING); header("Content-Type: text/json"); print Errors::to_json(Errors::E_UNAUTHORIZED); - $span->setAttribute('error', Errors::E_UNAUTHORIZED); + } } else if (method_exists($handler, 'index')) { - $span->addEvent("index"); $handler->index(); } - $span->addEvent("after/$method"); + $handler->after(); return; } header("Content-Type: text/plain"); print Errors::to_json(Errors::E_UNKNOWN_METHOD); - $span->setAttribute('error', Errors::E_UNKNOWN_METHOD); - |