daemon: fallback automatically when pcntl_signal() is not present

[tt-rss.git] / update_daemon.php

diff --git a/update_daemon.php b/update_daemon.php
old mode 100644 (file)
new mode 100755 (executable)
index 67a8781..03d366b
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -8,8 +8,6 @@
 
        declare(ticks = 1);
 
-       define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon');
-       define('SIMPLEPIE_CACHE_DIR',   '/var/tmp/simplepie-ttrss-cache-daemon');
        define('DISABLE_SESSIONS', true);
 
        require_once "version.php";
@@ -34,7 +32,6 @@
        require_once "db.php";
        require_once "db-prefs.php";
        require_once "functions.php";
-       require_once "magpierss/rss_fetch.inc";
 
        error_reporting(DEFAULT_ERROR_LEVEL);
 
@@ -47,8 +44,12 @@
                die("received SIGALRM, hang in feed update?\n");
        }
 
-       pcntl_signal(SIGINT, sigint_handler);
-       pcntl_signal(SIGALRM, sigalrm_handler);
+       if (function_exists('pcntl_signal')) {
+               pcntl_signal(SIGINT, sigint_handler);
+               pcntl_signal(SIGALRM, sigalrm_handler);
+       } else {
+               _debug("Warning: pcntl_signal function not present, continuing without support for signals.");  
+       }
 
        $lock_handle = make_lockfile("update_daemon.lock");
 
@@ -57,6 +58,8 @@
                        "Maybe another daemon is already running.\n");
        }
 
+       // Testing database connection.
+       // It is unnecessary to start the fork loop if database is not ok.
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
        if (!$link) {
@@ -67,16 +70,6 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
-
        db_close($link);
 
        $last_purge = 0;