Skip to content
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

disable monitor interactive paging on windows #269 #271

Merged
merged 4 commits into from
Oct 23, 2024
Merged

disable monitor interactive paging on windows #269 #271

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16353cc
disable monitor interactive paging on windows
haristku Oct 22, 2024
6a7c9fb
Update Commands/Monitor.php
haristku Oct 22, 2024
10df3c9
Simplifying the function
haristku Oct 22, 2024
06b1286
fix PHPCS check
haristku Oct 22, 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
146 changes: 95 additions & 51 deletions Commands/Monitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@
protected function configure()
{
$this->setName('queuedtracking:monitor');
$this->setDescription("Shows and updates the current state of the queue every 2 seconds.\n Key ,=first page, .=last page, 0-9=move to page section, arrow LEFT=prev page, RIGHT=next page, UP=next 10 pages, DOWN=prev 10 pages, q=quit");
if ($this->interactiveCapability()) {
$this->setDescription("Shows and updates the current state of the queue every 2 seconds.\n Key ,=first page, .=last page, 0-9=move to page section, arrow LEFT=prev page, RIGHT=next page, UP=next 10 pages, DOWN=prev 10 pages, q=quit");
} else {
$this->setDescription("Shows and updates the current state of the queue every 2 seconds.");
}
$this->addRequiredValueOption('iterations', null, 'If set, will limit the number of monitoring iterations done.');
$this->addRequiredValueOption('perpage', 'p', 'Number of queue worker displayed per page.', 16);
$this->addRequiredValueOption('rowperpage', 'r', 'Number of queue worker displayed per page.', 16);
$this->addRequiredValueOption('jumptopage', 'p', 'Jump to page (p).', 1);
}

/**
Expand Down Expand Up @@ -66,14 +71,15 @@
));
$iterationCount = 0;

$qCurrentPage = 1;
$qCurrentPage = $this->getJumpToPageFromArg();
$qCount = count($queues);
$qPerPAge = min(max($this->getPerPageFromArg(), 1), $qCount);
$qPageCount = ceil($qCount / $qPerPAge);

readline_callback_handler_install('', function () {
});
stream_set_blocking(STDIN, false);

Check failure on line 78 in Commands/Monitor.php

View workflow job for this annotation

GitHub Actions / PHPCS 

Monitor.php: Whitespace found at end of line
if ($this->interactiveCapability()) {
readline_callback_handler_install('', function () {});

Check failure on line 80 in Commands/Monitor.php

View workflow job for this annotation

GitHub Actions / PHPCS 

Monitor.php: Closing brace must be on a line by itself
stream_set_blocking(STDIN, false);
}

$output->writeln(str_repeat("-", 30));
$output->writeln("<fg=black;bg=white;options=bold>" . str_pad(" Q INDEX", 10) . str_pad(" | REQUEST SETS", 20) . "</>");
Expand All @@ -88,7 +94,7 @@

while (1) {
if (microtime(true) - $lastStatsTimer >= 2 || $keyPressed != "") {
$output->write("\e[" . ($qPerPAge + 5) . "A");
$output->write("\e[" . ($qPerPAge + 5) . "A\e[0G");

$qCurrentPage = min(max($qCurrentPage, 1), $qPageCount);
$memory = $backend->getMemoryStats(); // I know this will only work with redis currently as it is not defined in backend interface etc. needs to be refactored once we add another backend
Expand Down Expand Up @@ -120,7 +126,7 @@
$output->writeln("<fg=black;bg=white;options=bold>" . str_pad(" " . ($qCount) . " Q", 10) . " | " . str_pad(number_format($sumInQueue) . " R", 16) . "</>");
$output->writeln(str_repeat("-", 30));
$output->writeln(sprintf(
"Q [%s-%s] | <info>page %s/%s</> | <comment>press (0-9.,q) or arrow(L,R,U,D)</> | diff/sec %s \n" .
"Q [%s-%s] | <info>page %s/%s</>" . ($this->interactiveCapability() ? " | <comment>press (0-9.,q) or arrow(L,R,U,D)</>" : " | <error>use -p arg to jump to specific page</>"). " | diff/sec %s \n" .

Check failure on line 129 in Commands/Monitor.php

View workflow job for this annotation

GitHub Actions / PHPCS 

Monitor.php: Expected at least 1 space before "."; 0 found
"%s used memory (%s peak). <info>%d</> workers active." . str_repeat(" ", 15),
($idx - $qPerPAge + 1),
$idx,
Expand All @@ -143,44 +149,46 @@
$lastStatsTimer = microtime(true);
}

$keyStroke = stream_get_contents(STDIN, 3);
$keyPressed = strlen($keyStroke) == 3 ? $keyStroke[2] : (strlen($keyStroke) > 0 ? $keyStroke[0] : "");
if ($keyPressed != "" and in_array($keyPressed, array(".", ",", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "q"))) {
switch ($keyPressed) {
case "0":
case "1":
case "2":
case "3":
case "4":
case "5":
case "6":
case "7":
case "8":
case "9":
$keyPressed = $keyPressed != "0" ? $keyPressed : "10";
$qCurrentPage = floor(($qCurrentPage - 0.1) / 10) * 10 + (int)$keyPressed;
break;
case "C":
$qCurrentPage++;
break;
case "D":
$qCurrentPage--;
break;
case "A":
$qCurrentPage += 10;
break;
case "B":
$qCurrentPage -= 10;
break;
case ",":
$qCurrentPage = 1;
break;
case ".":
$qCurrentPage = $qPageCount;
break;
case "q":
$output->writeln('');
die;
if ($this->interactiveCapability()) {
$keyStroke = stream_get_contents(STDIN, 3);
$keyPressed = strlen($keyStroke) == 3 ? $keyStroke[2] : (strlen($keyStroke) > 0 ? $keyStroke[0] : "");
if ($keyPressed != "" and in_array($keyPressed, array(".", ",", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "q"))) {
switch ($keyPressed) {
case "0":
case "1":
case "2":
case "3":
case "4":
case "5":
case "6":
case "7":
case "8":
case "9":
$keyPressed = $keyPressed != "0" ? $keyPressed : "10";
$qCurrentPage = floor(($qCurrentPage - 0.1) / 10) * 10 + (int)$keyPressed;
break;
case "C":
$qCurrentPage++;
break;
case "D":
$qCurrentPage--;
break;
case "A":
$qCurrentPage += 10;
break;
case "B":
$qCurrentPage -= 10;
break;
case ",":
$qCurrentPage = 1;
break;
case ".":
$qCurrentPage = $qPageCount;
break;
case "q":
$output->writeln('');
die;
}
}
}

Expand Down Expand Up @@ -212,21 +220,57 @@
}

/**
* Loads the `perpage` argument from the commands arguments.
* Loads the `rowperpage` argument from the commands arguments.
*
* @return int|null
*/
private function getPerPageFromArg()
{
$perPage = $this->getInput()->getOption('perpage');
$perPage = $this->getInput()->getOption('rowperpage');
if (!is_numeric($perPage)) {
throw new \Exception('perpage needs to be numeric');
throw new \Exception('rowperpage needs to be numeric');
} else {
$perPage = (int)$perPage;
if ($perPage <= 0) {
throw new \Exception('perpage needs to be a non-zero positive number');
throw new \Exception('rowperpage needs to be a non-zero positive number');
}
}
return $perPage;
}

/**
* Loads the `jumptopage` argument from the commands arguments.
*
* @return int|null
*/
private function getJumpToPageFromArg()
{
$perPage = $this->getInput()->getOption('jumptopage');
if (!is_numeric($perPage)) {
throw new \Exception('jumptopage needs to be numeric');
} else {
$perPage = (int)$perPage;
if ($perPage <= 0) {
throw new \Exception('jumptopage needs to be a non-zero positive number');
}
}
return $perPage;
}

/**
*
* @return bool
*/
private function interactiveCapability()
{
if (str_starts_with(strtoupper(PHP_OS), 'WIN')) {
haristku marked this conversation as resolved.
Show resolved Hide resolved
return false;
}

Check failure on line 269 in Commands/Monitor.php

View workflow job for this annotation

GitHub Actions / PHPCS 

Monitor.php: Whitespace found at end of line
if (function_exists('readline_callback_handler_install') == false) {
return false;
}

return true;
}
}
Loading