Skip to content

Add debug for missing queue data #682

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
timotei-litespeed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add debug for missing queue data #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 26 additions & 17 deletions src/css.cls.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,30 +359,39 @@ private function _send_req($request_url, $queue_k, $uid, $user_agent, $vary, $ur
*/
private function _save_con($type, $css, $queue_k, $mobile, $webp)
{
// Add filters
$css = apply_filters('litespeed_' . $type, $css, $queue_k);
Debug2::debug2('[CSS] con: ' . $css);
if( !empty($this->_queue[$queue_k]['url_tag']) && !empty($this->_queue[$queue_k]['vary']) ){
// Add filters
$css = apply_filters('litespeed_' . $type, $css, $queue_k);
Debug2::debug2('[CSS] con: ' . $css);

if (substr($css, 0, 2) == '/*' && substr($css, -2) == '*/') {
self::debug('❌ empty ' . $type . ' [content] ' . $css);
// continue; // Save the error info too
}

if (substr($css, 0, 2) == '/*' && substr($css, -2) == '*/') {
self::debug('❌ empty ' . $type . ' [content] ' . $css);
// continue; // Save the error info too
}
// Write to file
$filecon_md5 = md5($css);

// Write to file
$filecon_md5 = md5($css);
$filepath_prefix = $this->_build_filepath_prefix($type);
$static_file = LITESPEED_STATIC_DIR . $filepath_prefix . $filecon_md5 . '.css';

$filepath_prefix = $this->_build_filepath_prefix($type);
$static_file = LITESPEED_STATIC_DIR . $filepath_prefix . $filecon_md5 . '.css';
File::save($static_file, $css, true);

File::save($static_file, $css, true);
$url_tag = $this->_queue[$queue_k]['url_tag'];
$vary = $this->_queue[$queue_k]['vary'];
Debug2::debug2("[CSS] Save URL to file [file] $static_file [vary] $vary");

$url_tag = $this->_queue[$queue_k]['url_tag'];
$vary = $this->_queue[$queue_k]['vary'];
Debug2::debug2("[CSS] Save URL to file [file] $static_file [vary] $vary");
$this->cls('Data')->save_url($url_tag, $vary, $type, $filecon_md5, dirname($static_file), $mobile, $webp);

$this->cls('Data')->save_url($url_tag, $vary, $type, $filecon_md5, dirname($static_file), $mobile, $webp);
Purge::add(strtoupper($type) . '.' . md5($queue_k));
}
else{
$not_found = array();
if( !isset($this->_queue[$queue_k]['url_tag']) ) $not_found[] = '[url_tag]';
if( !isset($this->_queue[$queue_k]['vary']) ) $not_found[] = '[vary]';

Purge::add(strtoupper($type) . '.' . md5($queue_k));
self::debug('No ' . implode( ' and ', $not_found ) . ' found in CCSS queque for key ' . $queue_k );
}
}

/**
Expand Down
60 changes: 39 additions & 21 deletions src/ucss.cls.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,30 +361,39 @@ private function _send_req($request_url, $queue_k, $uid, $user_agent, $vary, $ur
*/
private function _save_con($type, $css, $queue_k, $is_mobile, $is_webp)
{
// Add filters
$css = apply_filters('litespeed_' . $type, $css, $queue_k);
self::debug2('con: ', $css);
if( !empty($this->_queue[$queue_k]['url_tag']) && !empty($this->_queue[$queue_k]['vary']) ){
// Add filters
$css = apply_filters('litespeed_' . $type, $css, $queue_k);
self::debug2('con: ', $css);

if (substr($css, 0, 2) == '/*' && substr($css, -2) == '*/') {
self::debug('❌ empty ' . $type . ' [content] ' . $css);
// continue; // Save the error info too
}

if (substr($css, 0, 2) == '/*' && substr($css, -2) == '*/') {
self::debug('❌ empty ' . $type . ' [content] ' . $css);
// continue; // Save the error info too
}
// Write to file
$filecon_md5 = md5($css);

// Write to file
$filecon_md5 = md5($css);
$filepath_prefix = $this->_build_filepath_prefix($type);
$static_file = LITESPEED_STATIC_DIR . $filepath_prefix . $filecon_md5 . '.css';

$filepath_prefix = $this->_build_filepath_prefix($type);
$static_file = LITESPEED_STATIC_DIR . $filepath_prefix . $filecon_md5 . '.css';
File::save($static_file, $css, true);

File::save($static_file, $css, true);
$url_tag = $this->_queue[$queue_k]['url_tag'];
$vary = $this->_queue[$queue_k]['vary'];
self::debug2("Save URL to file [file] $static_file [vary] $vary");

$url_tag = $this->_queue[$queue_k]['url_tag'];
$vary = $this->_queue[$queue_k]['vary'];
self::debug2("Save URL to file [file] $static_file [vary] $vary");
$this->cls('Data')->save_url($url_tag, $vary, $type, $filecon_md5, dirname($static_file), $is_mobile, $is_webp);

$this->cls('Data')->save_url($url_tag, $vary, $type, $filecon_md5, dirname($static_file), $is_mobile, $is_webp);
Purge::add(strtoupper($type) . '.' . md5($queue_k));
}
else{
$not_found = array();
if( !isset($this->_queue[$queue_k]['url_tag']) ) $not_found[] = '[url_tag]';
if( !isset($this->_queue[$queue_k]['vary']) ) $not_found[] = '[vary]';

Purge::add(strtoupper($type) . '.' . md5($queue_k));
self::debug('No ' . implode( ' and ', $not_found ) . ' found in UCSS queque for key ' . $queue_k );
}
}

/**
Expand Down Expand Up @@ -543,11 +552,20 @@ public function notify()

// Save data
if (!empty($v['data_ucss'])) {
$is_mobile = $this->_queue[$v['queue_k']]['is_mobile'];
$is_webp = $this->_queue[$v['queue_k']]['is_webp'];
$this->_save_con('ucss', $v['data_ucss'], $v['queue_k'], $is_mobile, $is_webp);
if(!empty( $this->_queue[$v['queue_k']]['is_mobile'] ) && !empty( $this->_queue[$v['queue_k']]['is_webp'] ) ){
$is_mobile = $this->_queue[$v['queue_k']]['is_mobile'];
$is_webp = $this->_queue[$v['queue_k']]['is_webp'];
$this->_save_con('ucss', $v['data_ucss'], $v['queue_k'], $is_mobile, $is_webp);

$valid_i++;
$valid_i++;
}
else{
$not_found = array();
if( !isset($this->_queue[$v['queue_k']]['is_mobile']) ) $not_found[] = '[is_mobile]';
if( !isset($this->_queue[$v['queue_k']]['is_webp']) ) $not_found[] = '[is_webp]';

self::debug('No ' . implode( ' and ', $not_found ) . ' found in UCSS queque for key ' . $v['queue_k'] );
}
}

unset($this->_queue[$v['queue_k']]);
Expand Down