diff --git a/bin/monitor.php b/bin/monitor.php index 0c6c7155f..7df32a1cd 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -2,7 +2,7 @@ require(dirname(__FILE__)."/config.php"); require(WWW_DIR.'/lib/postprocess.php'); -$version="0.1r762"; +$version="0.1r763"; $db = new DB(); @@ -63,12 +63,13 @@ $mysql_command_1 = "$_mysql --defaults-file=$_conf/my.cnf -u$_DB_USER -h $_DB_HO $reset_bin = "UPDATE binaries SET procstat=0, procattempts=0, regexID=NULL, relpart=0, reltotalpart=0, relname=NULL;"; $mysql_command_2 = "$_mysql --defaults-file=$_conf/my.cnf -u$_DB_USER -h $_DB_HOST $_DB_NAME -e \"$reset_bin\""; $_active_regex = "select ID from releaseregex where status=1;"; -$mysql_command_3 = "$_mysql --defaults-file=$_conf/my.cnf -u$_DB_USER -h $_DB_HOST $_DB_NAME -e \"$_active_regex\" >> ../conf/active_regexes.txt"; +$mysql_command_3 = "cd $_conf && $_mysql --defaults-file=$_conf/my.cnf -u$_DB_USER -h $_DB_HOST $_DB_NAME -e \"$_active_regex\" >> active_regexes.txt"; $_disable_regex = "update releaseregex set status=0 where status=1;"; $mysql_command_4 = "$_mysql --defaults-file=$_conf/my.cnf -u$_DB_USER -h $_DB_HOST $_DB_NAME -e \"$_disable_regex\""; if ( $array['UGO_THREADED'] == "true" ) { shell_exec("$mysql_command_3 && $mysql_command_4"); + shell_exec("cd $_conf && $_sed -i -e 's/ID/ /g' active_regexes.txt") } //got microtime diff --git a/conf/default_regexes.txt b/conf/default_regexes.txt index 9870bef37..059bf3ff6 100644 --- a/conf/default_regexes.txt +++ b/conf/default_regexes.txt @@ -1,6 +1,6 @@ -ID -12 + 21 +12 31 34 40 @@ -1701,11 +1701,3 @@ ID 2321 2322 2323 -100017 -100016 -100006 -100018 -100019 -100020 -100021 -100023 diff --git a/conf/jonnyboys_defaults.sh b/conf/jonnyboys_defaults.sh index 1efc72d23..ccd20eb93 100644 --- a/conf/jonnyboys_defaults.sh +++ b/conf/jonnyboys_defaults.sh @@ -242,7 +242,7 @@ export MISC_ONLY="true" #run ugo's automake.php script to create releases, this does not use regexes and will run in a loop prior #to update_releases.php -export UGO_THREADED="true" +export UGO_THREADED="truef" ############################################################ @@ -280,7 +280,7 @@ export INNODB_LARGE="172800" #Choose your database engine, comment the one true/false #you should have already converted your database to InnoDB engine, if you select true here -export INNODB="false" +export INNODB="true" ############################################################ @@ -393,7 +393,7 @@ export FIX_POSIX="false" #these are set to false by default, enable if you want them export USE_HTOP="false" export USE_BWMNG="false" -export USE_MYTOP="false" +export USE_MYTOP="true" export USE_VNSTAT="false" export USE_ATOP="false" export USE_NMON="false" diff --git a/conf/jonnyboys_my.cnf b/conf/jonnyboys_my.cnf index 768ec8274..1b86fce26 100644 --- a/conf/jonnyboys_my.cnf +++ b/conf/jonnyboys_my.cnf @@ -97,8 +97,8 @@ log_error = /var/lib/mysql/error.log # other settings you may need to change. #server-id = 1 #log_bin = /var/log/mysql/mysql-bin.log -expire_logs_days = 10 -max_binlog_size = 100M +#expire_logs_days = 10 +#max_binlog_size = 100M #binlog_do_db = include_database_name #binlog_ignore_db = include_database_name # @@ -119,7 +119,41 @@ max_binlog_size = 100M # ssl-key=/etc/mysql/server-key.pem - + max_user_connections = 200 + table_cache=2000 + + #InnoDB specifics + + #Engine options + innodb = ON + innodb_file_format = Barracuda + innodb_file_per_table = 1 + + #misc uncategorized + innodb_table_locks = false + innodb_use_sys_malloc = 1 + + #threading + innodb_thread_concurrency = 8 + innodb_read_io_threads = 4 + innodb_write_io_threads = 4 + innodb_purge_threads = 1 + + #buffer pool related + innodb_buffer_pool_size = 4G + innodb_buffer_pool_instances = 8 + innodb_change_buffering = all + innodb_max_dirty_pages_pct = 90 + + #flush related + innodb_flush_method = O_DIRECT + innodb_flush_log_at_trx_commit = 0 + + #transaction logs + innodb_log_buffer_size = 2G + innodb_log_files_in_group = 2 + innodb_log_file_size = 2G + [mysqldump] quick quote-names diff --git a/scripts/reactivate_regexes.sh b/scripts/reactivate_regexes.sh index 949ca3f9c..7841e8524 100755 --- a/scripts/reactivate_regexes.sh +++ b/scripts/reactivate_regexes.sh @@ -1,16 +1,11 @@ SOURCE="${BASH_SOURCE[0]}" DIR="$( dirname "$SOURCE" )" -while [ -h "$SOURCE" ] -do - SOURCE="$(readlink "$SOURCE")" - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" -done -DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" cd $DIR"/../conf" -while read p; do - mysql --defaults-file=my.cnf -uroot newznab -e "update releaseregex set status=1 where status=0 and ID=$p" -done < active_regexes.txt +for fn in `cat active_regexes.txt`; do + echo "Resetting $fn" + mysql --defaults-file=my.cnf -uroot newznab -e "update releaseregex set status=1 where ID=$fn" +done -rm active_regexes.txt + +#rm active_regexes.txt