diff --git a/Changelog b/Changelog index 137119eba..4a0479a7a 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2015-10-28 DariusIII + Upd: Update monitor, tmux and fix patches and schema Fix: Wrong name of DB_TYPE constant Chg: Rename scrape into irc_scraper Upd: Change the name of the versions file to nntmux.xml diff --git a/misc/update_scripts/nix_scripts/tmux/monitor.php b/misc/update_scripts/nix_scripts/tmux/monitor.php index 85965ef6f..6fd01b315 100644 --- a/misc/update_scripts/nix_scripts/tmux/monitor.php +++ b/misc/update_scripts/nix_scripts/tmux/monitor.php @@ -14,6 +14,8 @@ $tOut = new TmuxOutput($pdo); $runVar['paths']['misc'] = NN_MISC; $runVar['paths']['lib'] = NN_LIB; +$runVar['paths']['cli'] = NN_ROOT . 'cli/'; +$runVar['paths']['scraper'] = NN_MISC . 'IRCScraper' . DS . 'scrape.php'; $db_name = DB_NAME; $dbtype = DB_TYPE; $tmux = $tRun->get('niceness'); diff --git a/newznab/TmuxRun.php b/newznab/TmuxRun.php index 5ad60f010..fb272c157 100644 --- a/newznab/TmuxRun.php +++ b/newznab/TmuxRun.php @@ -681,7 +681,7 @@ class TmuxRun extends Tmux if (shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") == 1) { shell_exec( "tmux respawnp -t{$runVar['constants']['tmux_session']}:${pane}.0 ' \ - {$runVar['commands']['_phpn']} {$runVar['paths']['misc']}IRCScraper/scrape.php true'" + {$runVar['commands']['_phpn']} {$runVar['paths']['scraper']} true'" ); } } else { diff --git a/resources/db/patches/mysql/0078~site.sql b/resources/db/patches/mysql/0078~site.sql index 77d5e8f43..df8b83032 100644 --- a/resources/db/patches/mysql/0078~site.sql +++ b/resources/db/patches/mysql/0078~site.sql @@ -32,7 +32,7 @@ INSERT IGNORE INTO settings (setting, value) VALUES ('fixnamesperrun', '1'), ('zippath', ''), ('processjpg', '1'), -('scrape', '1'), +('run_ircscraper', '0'), ('nntpretries', '10'), ('imdburl', '0'), ('yydecoderpath', ''), diff --git a/resources/db/schema/schema.sql b/resources/db/schema/schema.sql index f05838f7c..041a92ad9 100644 --- a/resources/db/schema/schema.sql +++ b/resources/db/schema/schema.sql @@ -65,7 +65,7 @@ INSERT INTO site (setting, value) VALUES ('fixnamesperrun', '1'), ('zippath', ''), ('processjpg', '1'), -('scrape', '1'), +('run_ircscraper', '0'), ('nntpretries', '10'), ('imdburl', '0'), ('yydecoderpath', ''),