projects
/
m6w6
/
seekat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
compatibility with 2.6.0 and 3.1.0
[m6w6/seekat]
/
lib
/
API.php
diff --git
a/lib/API.php
b/lib/API.php
index ba384c5ad4eb0d591ebc3a1aa671099b841214b9..1fd3da011150fdfa0c3d20216b69da24a95553df 100644
(file)
--- a/
lib/API.php
+++ b/
lib/API.php
@@
-3,6
+3,7
@@
namespace seekat;
use Countable;
namespace seekat;
use Countable;
+use Exception;
use Generator;
use http\{
Client,
use Generator;
use http\{
Client,
@@
-155,10
+156,16
@@
class API implements IteratorAggregate, Countable {
}
/* fetch resource, unless already localized, and try for {$method}_url */
}
/* fetch resource, unless already localized, and try for {$method}_url */
- return $this->$method->get(...$args)->otherwise(function(Throwable $error) use($method, $args) {
+ return $this->$method->get(...$args)->otherwise(function($error) use($method, $args) {
+ if ($error instanceof Throwable) {
+ $message = $error->getMessage();
+ } else {
+ $message = $error;
+ $error = new Exception($error);
+ }
if ($this->exists($method."_url", $url)) {
if ($this->exists($method."_url", $url)) {
- $this->__log->info(__FUNCTION__."($method): ". $
error->getMessage()
, [
+ $this->__log->info(__FUNCTION__."($method): ". $
message
, [
"url" => (string) $this->__url
]);
"url" => (string) $this->__url
]);
@@
-166,7
+173,7
@@
class API implements IteratorAggregate, Countable {
return $this->withUrl($url)->get(...$args);
}
return $this->withUrl($url)->get(...$args);
}
- $this->__log->error(__FUNCTION__."($method): ". $
error->getMessage()
, [
+ $this->__log->error(__FUNCTION__."($method): ". $
message
, [
"url" => (string) $this->__url
]);
"url" => (string) $this->__url
]);