valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return result codes if DB connection or --debug-feed fails

This commit is contained in:
Andrew Dolgov 2017-04-25 13:39:01 +03:00
parent edb56571f2
commit 3c11159776
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/db.php
View File

@ -23,12 +23,16 @@ class Db implements IDb {
} }
} }
if (!$this->adapter) die("Error initializing database adapter for " . DB_TYPE); if (!$this->adapter) {
print("Error initializing database adapter for " . DB_TYPE);
exit(100);
}
$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : ""); $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
if (!$this->link) { if (!$this->link) {
die("Error connecting through adapter: " . $this->adapter->last_error()); print("Error connecting through adapter: " . $this->adapter->last_error());
exit(101);
} }
error_reporting($er); error_reporting($er);

3
classes/db/mysqli.php
View File

@ -14,7 +14,8 @@ class Db_Mysqli implements IDb {
return $this->link; return $this->link;
} else { } else {
die("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error()); print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
exit(102);
} }
} }

3
classes/db/pgsql.php
View File

@ -21,7 +21,8 @@ class Db_Pgsql implements IDb {
$this->link = pg_connect($string); $this->link = pg_connect($string);
if (!$this->link) { if (!$this->link) {
die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error()); print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
exit(102);
} }
$this->init(); $this->init();

4
update.php
View File

@ -401,7 +401,9 @@
$_REQUEST['xdebug'] = 1; $_REQUEST['xdebug'] = 1;
update_rss_feed($feed); $rc = is_object(update_rss_feed($feed)) ? 0 : 1;
exit($rc);
} }
if (isset($options["decrypt-feeds"])) { if (isset($options["decrypt-feeds"])) {