Skip to content

Release relay b #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gridpane wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Release relay b #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e65cb1e
poc 1
gridpane Jul 8, 2024
18dc9e2
release-relay-b
gridpane Jul 8, 2024
3b14c23
relay
gridpane Jul 8, 2024
845f6ae
formatting
gridpane Jul 8, 2024
f67fe69
formatting2
gridpane Jul 8, 2024
3a69e4d
formatting3
gridpane Jul 8, 2024
a3f58f0
formatting4
gridpane Jul 8, 2024
35f1755
formatting5
gridpane Jul 8, 2024
6c2e585
filters and constants
gridpane Jul 9, 2024
4709b6a
relay
gridpane Jul 9, 2024
712f132
relay constant
gridpane Jul 9, 2024
92f6cf7
disable relay cache for clearing
gridpane Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 107 additions & 49 deletions admin/class-nginx-helper-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,25 +273,28 @@ public function nginx_helper_default_settings() {
'purge_page_on_new_comment' => 1,
'purge_page_on_deleted_comment' => 1,
'purge_feeds' => 1,
'relay_client' => false,
'redis_hostname' => '127.0.0.1',
'redis_port' => '6379',
'redis_prefix' => 'nginx-cache:',
'redis_unix_socket' => '',
'redis_username' => '',
'redis_password' => '',
'redis_database' => 0,
'redis_timeout' => 5,
'redis_read_timeout' => 1.5,
'purge_url' => '',
'auth_enabled_by_constant' => 0,
'cache_method_set_by_constant' => 0,
'purge_method_set_by_constant' => 0,
'redis_hostname_set_by_constant' => 0,
'redis_port_set_by_constant' => 0,
'redis_unix_socket_set_by_constant' => 0,
'redis_prefix_set_by_constant' => 0,
'redis_database_set_by_constant' => 0,
'redis_username_set_by_constant' => 0,
'redis_password_socket_set_by_constant' => 0,
'cache_method_set_by_constant' => false,
'purge_method_set_by_constant' => false,
'redis_hostname_set_by_constant' => false,
'redis_port_set_by_constant' => false,
'redis_unix_socket_set_by_constant' => false,
'redis_prefix_set_by_constant' => false,
'redis_database_set_by_constant' => false,
'redis_username_set_by_constant' => false,
'redis_password_socket_set_by_constant' => false,
'homepage_purge_post_type_exceptions' => array(),
'post_type_purge_exceptions' => array(),
);

}
Expand All @@ -317,19 +320,32 @@ public function nginx_helper_settings() {
$this->nginx_helper_default_settings()
);

if ( defined( 'RT_WP_NGINX_HELPER_HOMEPAGE_PURGE_EXCEPTIONS' ) ) {
$data['homepage_purge_post_type_exceptions'] = RT_WP_NGINX_HELPER_HOMEPAGE_PURGE_EXCEPTIONS;
}
if ( defined( 'GP_NGINX_HELPER_HOMEPAGE_PURGE_EXCEPTIONS' ) ) {
$data['homepage_purge_post_type_exceptions'] = GP_NGINX_HELPER_HOMEPAGE_PURGE_EXCEPTIONS;
}

if ( defined( 'GP_NGINX_HELPER_POST_TYPE_PURGE_EXCEPTIONS' ) ) {
$data['post_type_purge_exceptions'] = GP_NGINX_HELPER_POST_TYPE_PURGE_EXCEPTIONS;
}

if ( defined( 'RT_WP_NGINX_HELPER_PURGE_METHOD' ) ) {
if ( defined( 'GP_NGINX_HELPER_PURGE_METHOD' ) ) {
$data['purge_method'] = GP_NGINX_HELPER_PURGE_METHOD;
$data['purge_method_set_by_constant'] = 'GP_NGINX_HELPER_PURGE_METHOD';
} elseif ( defined( 'RT_WP_NGINX_HELPER_PURGE_METHOD' ) ) {
$data['purge_method'] = RT_WP_NGINX_HELPER_PURGE_METHOD;
$data['purge_method_set_by_constant'] = 1;
$data['purge_method_set_by_constant'] = 'RT_WP_NGINX_HELPER_PURGE_METHOD';
}

if ( defined( 'RT_WP_NGINX_HELPER_CACHE_METHOD' ) ) {
if ( defined( 'GP_NGINX_HELPER_CACHE_METHOD' ) ) {
$data['cache_method'] = GP_NGINX_HELPER_CACHE_METHOD;
$data['cache_method_set_by_constant'] = 'GP_NGINX_HELPER_PURGE_METHOD';
if ( 'enable_fastcgi' === GP_NGINX_HELPER_CACHE_METHOD ) {
$data['enable_purge'] = 1;
return $data;
}
} elseif ( defined( 'RT_WP_NGINX_HELPER_CACHE_METHOD' ) ) {
$data['cache_method'] = RT_WP_NGINX_HELPER_CACHE_METHOD;
$data['cache_method_set_by_constant'] = 1;

$data['cache_method_set_by_constant'] = 'RT_WP_NGINX_HELPER_PURGE_METHOD';
if ( 'enable_fastcgi' === RT_WP_NGINX_HELPER_CACHE_METHOD ) {
$data['enable_purge'] = 1;
return $data;
Expand All @@ -343,43 +359,86 @@ public function nginx_helper_settings() {
$redis_port = false;
$redis_unix_socket = false;

if ( defined( 'RT_WP_NGINX_HELPER_REDIS_PREFIX' ) ) {
if ( defined( 'GP_NGINX_HELPER_USE_RELAY' ) ) {
if (in_array( 'relay', get_loaded_extensions())) {
$data['relay_client'] = GP_NGINX_HELPER_USE_RELAY;
}
}

if ( defined( 'GP_NGINX_HELPER_REDIS_PREFIX' ) ) {
$redis_prefix = GP_NGINX_HELPER_REDIS_PREFIX;
$data['redis_prefix_set_by_constant'] = 'GP_NGINX_HELPER_PURGE_METHOD';
} elseif ( defined( 'RT_WP_NGINX_HELPER_REDIS_PREFIX' ) ) {
$redis_prefix = RT_WP_NGINX_HELPER_REDIS_PREFIX;
$data['redis_prefix'] = $redis_prefix;
$data['redis_prefix_set_by_constant'] = 1;
$data['redis_prefix_set_by_constant'] = 'RT_WP_NGINX_HELPER_PURGE_METHOD';
}
if ( $redis_prefix ) {
$data['redis_prefix'] = $redis_prefix;
}

if ( defined( 'RT_WP_NGINX_HELPER_REDIS_PORT' ) ) {
if ( defined( 'GP_NGINX_HELPER_REDIS_PORT' ) ) {
$redis_port = GP_NGINX_HELPER_REDIS_PORT;
$data['redis_port_set_by_constant'] = 'GP_NGINX_HELPER_PURGE_METHOD';
} elseif ( defined( 'RT_WP_NGINX_HELPER_REDIS_PORT' ) ) {
$redis_port = RT_WP_NGINX_HELPER_REDIS_PORT;
$data['redis_port'] = $redis_port;
$data['redis_port_set_by_constant'] = 1;
$data['redis_port_set_by_constant'] = 'RT_WP_NGINX_HELPER_PURGE_METHOD';
}
if ( $redis_port ) {
$data['redis_port'] = $redis_port;
}

if ( defined( 'RT_WP_NGINX_HELPER_REDIS_HOSTNAME' ) ) {
if ( defined( 'GP_NGINX_HELPER_REDIS_HOSTNAME' ) ) {
$redis_hostname = GP_NGINX_HELPER_REDIS_HOSTNAME;
$data['redis_hostname_set_by_constant'] = 'GP_NGINX_HELPER_REDIS_HOSTNAME';
} elseif ( defined( 'RT_WP_NGINX_HELPER_REDIS_HOSTNAME' ) ) {
$redis_hostname = RT_WP_NGINX_HELPER_REDIS_HOSTNAME;
$data['redis_hostname'] = $redis_hostname;
$data['redis_hostname_set_by_constant'] = 1;
$data['redis_hostname_set_by_constant'] = 'RT_WP_NGINX_HELPER_REDIS_HOSTNAME';
}
if ( $redis_hostname ) {
$data['redis_hostname'] = $redis_hostname;
}

if ( defined( 'RT_WP_NGINX_HELPER_REDIS_UNIX_SOCKET' ) ) {
if ( defined( 'GP_NGINX_HELPER_REDIS_UNIX_SOCKET' ) ) {
$redis_unix_socket = GP_NGINX_HELPER_REDIS_UNIX_SOCKET;
$data['redis_unix_socket_set_by_constant'] = 'GP_NGINX_HELPER_REDIS_HOSTNAME';
} elseif ( defined( 'RT_WP_NGINX_HELPER_REDIS_UNIX_SOCKET' ) ) {
$redis_unix_socket = RT_WP_NGINX_HELPER_REDIS_UNIX_SOCKET;
$data['redis_unix_socket'] = $redis_unix_socket;
$data['redis_unix_socket_set_by_constant'] = 1;
$data['redis_unix_socket_set_by_constant'] = 'RT_WP_NGINX_HELPER_REDIS_HOSTNAME';
}
if ( $redis_unix_socket ) {
$data['redis_unix_socket'] = $redis_unix_socket;
}

if ( defined( 'GP_NGINX_HELPER_REDIS_DATABASE' ) ) {
$data['redis_database'] = GP_NGINX_HELPER_REDIS_DATABASE;
$data['redis_database_set_by_constant'] = 'GP_NGINX_HELPER_REDIS_DATABASE';
} elseif ( defined( 'RT_WP_NGINX_HELPER_REDIS_DATABASE' ) ) {
$data['redis_database'] = RT_WP_NGINX_HELPER_REDIS_DATABASE;
$data['redis_database_set_by_constant'] = 'RT_WP_NGINX_HELPER_REDIS_DATABASE';
}

if ( defined( 'RT_WP_NGINX_HELPER_REDIS_DATABASE' ) ) {
$data['redis_database'] = RT_WP_NGINX_HELPER_REDIS_DATABASE;
$data['redis_database_set_by_constant'] = 1;
if ( defined( 'GP_NGINX_HELPER_REDIS_USERNAME' ) ) {
$data['redis_username'] = GP_NGINX_HELPER_REDIS_USERNAME;
$data['redis_username_set_by_constant'] = 'GP_NGINX_HELPER_REDIS_USERNAME';
} elseif ( defined( 'RT_WP_NGINX_HELPER_REDIS_USERNAME' ) ) {
$data['redis_username'] = RT_WP_NGINX_HELPER_REDIS_USERNAME;
$data['redis_username_set_by_constant'] = 'RT_WP_NGINX_HELPER_REDIS_USERNAME';
}

if ( defined( 'RT_WP_NGINX_HELPER_REDIS_USERNAME' ) ) {
$data['redis_username'] = RT_WP_NGINX_HELPER_REDIS_USERNAME;
$data['redis_username_set_by_constant'] = 1;
if ( defined( 'GP_NGINX_HELPER_REDIS_PASSWORD' ) ) {
$data['redis_password'] = GP_NGINX_HELPER_REDIS_PASSWORD;
$data['redis_password_set_by_constant'] = 'GP_NGINX_HELPER_REDIS_PASSWORD';
} elseif ( defined( 'RT_WP_NGINX_HELPER_REDIS_PASSWORD' ) ) {
$data['redis_password'] = RT_WP_NGINX_HELPER_REDIS_PASSWORD;
$data['redis_password_set_by_constant'] = 'RT_WP_NGINX_HELPER_REDIS_PASSWORD';
}

if ( defined( 'RT_WP_NGINX_HELPER_REDIS_PASSWORD' ) ) {
$data['redis_password'] = RT_WP_NGINX_HELPER_REDIS_PASSWORD;
$data['redis_password_set_by_constant'] = 1;
if ( defined( 'GP_NGINX_HELPER_REDIS_TIMEOUT' ) ) {
$data['redis_timeout'] = GP_NGINX_HELPER_REDIS_TIMEOUT;
}

if ( defined( 'GP_NGINX_HELPER_REDIS_READ_TIMEOUT' ) ) {
$data['redis_read_timeout'] = GP_NGINX_HELPER_REDIS_READ_TIMEOUT;
}

if ( $redis_prefix && $redis_hostname && $redis_port ) {
Expand Down Expand Up @@ -672,19 +731,18 @@ public function update_map() {
*/
public function set_future_post_option_on_future_status( $new_status, $old_status, $post ) {

global $blog_id, $nginx_purger;

$exclude_post_types = apply_filters( 'rt_nginx_helper_exclude_post_types', array( 'nav_menu_item' ) );
global $blog_id, $nginx_purger, $nginx_helper_admin;

$post_type = $post->post_type;
$purge_exceptions = $nginx_helper_admin->options['post_type_purge_exceptions'];
$purge_exceptions[] = 'nav_menu_item';
$exclude_post_types = apply_filters( 'rt_nginx_helper_exclude_post_types', $purge_exceptions );
$post_type = $post->post_type;

if ( in_array( $post_type, $exclude_post_types, true ) ) {
if ( 'nav_menu_item' !== $post_type ) {
$nginx_purger->log('* * * * *');
$nginx_purger->log('* Post Type update - ' . $post_type . ' - purge trigger excluded...');
$nginx_purger->log('* Filter: -> rt_nginx_helper_exclude_post_types');
$nginx_purger->log('* * * * *');
}
$nginx_purger->log('* * * * *');
$nginx_purger->log('* Post Type update - ' . $post_type . ' - purge trigger excluded...');
$nginx_purger->log('* Filter: -> rt_nginx_helper_exclude_post_types');
$nginx_purger->log('* * * * *');
return;
}

Expand Down
Loading