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

add schema checking to feed updating and update script

This commit is contained in:
Andrew Dolgov 2013-04-17 12:10:35 +04:00
parent a94379f118
commit 857efe49e6
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rssfuncs.php
View File

@ -60,6 +60,12 @@
function update_daemon_common($link, $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) { function update_daemon_common($link, $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
// Process all other feeds using last_updated and interval parameters // Process all other feeds using last_updated and interval parameters
$schema_version = get_schema_version($link);
if ($schema_version != SCHEMA_VERSION) {
die("Schema version is wrong, please upgrade the database.\n");
}
define('PREFS_NO_CACHE', true); define('PREFS_NO_CACHE', true);
// Test if the user has loggued in recently. If not, it does not update its feeds. // Test if the user has loggued in recently. If not, it does not update its feeds.

8
update.php
View File

@ -89,6 +89,14 @@
return; return;
} }
if (!isset($options['update-schema'])) {
$schema_version = get_schema_version($link);
if ($schema_version != SCHEMA_VERSION) {
die("Schema version is wrong, please upgrade the database.\n");
}
}
define('QUIET', isset($options['quiet'])); define('QUIET', isset($options['quiet']));
if (isset($options["log"])) { if (isset($options["log"])) {

4
update_daemon2.php
View File

@ -183,6 +183,10 @@
db_close($link); db_close($link);
if ($schema_version != SCHEMA_VERSION) {
die("Schema version is wrong, please upgrade the database.\n");
}
while (true) { while (true) {
// Since sleep is interupted by SIGCHLD, we need another way to // Since sleep is interupted by SIGCHLD, we need another way to