Add verbosity options

main
gravel 3 years ago
parent 8983ff656a
commit 69fbe885c7
Signed by: gravel
SSH Key Fingerprint: SHA256:p4HP49CCk4YQMkJpWJ09L8peEPQWjERtdCRAFxPfbOY

@ -16,6 +16,10 @@ all: fetch html
fetch: fetch:
/bin/php php/fetch-servers.php /bin/php php/fetch-servers.php
# Fetch room listing with extra verbosity.
fetch-v:
/bin/php php/fetch-servers.php --verbose
# Generate HTML from data. # Generate HTML from data.
html: html:
/bin/php php/generate-html.php /bin/php php/generate-html.php

@ -8,10 +8,16 @@
require_once 'utils/servers-rooms.php'; require_once 'utils/servers-rooms.php';
function main() { function main() {
global $LOGGING_VERBOSITY;
// Get join links -> Add known servers -> // Get join links -> Add known servers ->
// De-dupe based on base URL -> // De-dupe based on base URL ->
// Test domains -> De-dupe based on pubkey // Test domains -> De-dupe based on pubkey
$options = getopt("v", ["verbose"]);
if (isset($options["v"]) or isset($options["verbose"])) {
$LOGGING_VERBOSITY = LoggingVerbosity::Debug;
}
global $CACHE_ROOT, $ROOMS_FILE, $KNOWN_SERVERS, $KNOWN_PUBKEYS; global $CACHE_ROOT, $ROOMS_FILE, $KNOWN_SERVERS, $KNOWN_PUBKEYS;
file_exists($CACHE_ROOT) or mkdir($CACHE_ROOT, 0700); file_exists($CACHE_ROOT) or mkdir($CACHE_ROOT, 0700);

@ -40,14 +40,12 @@
return match($verbosity) { return match($verbosity) {
LoggingVerbosity::Error => "\033[31m", LoggingVerbosity::Error => "\033[31m",
LoggingVerbosity::Warning => "\033[93m", LoggingVerbosity::Warning => "\033[93m",
// LoggingVerbosity::Debug => "\033[90m", LoggingVerbosity::Debug => "\033[90m",
default => '' default => ''
}; };
} }
} }
$VERBOSITY = LoggingVerbosity::Info;
/** /**
* Calculate process runtime as [s, ns]. * Calculate process runtime as [s, ns].
* @return int[] Seconds and nanoseconds. * @return int[] Seconds and nanoseconds.
@ -73,8 +71,8 @@
} }
function _log_message(string $msg, int $message_verbosity) { function _log_message(string $msg, int $message_verbosity) {
global $VERBOSITY; global $LOGGING_VERBOSITY;
if ($message_verbosity > $VERBOSITY) return; if ($message_verbosity > $LOGGING_VERBOSITY) return;
$runtime = runtime_str(); $runtime = runtime_str();
$marker = LoggingVerbosity::getVerbosityMarker($message_verbosity); $marker = LoggingVerbosity::getVerbosityMarker($message_verbosity);
$color_marker = LoggingVerbosity::getVerbosityColorMarker($message_verbosity); $color_marker = LoggingVerbosity::getVerbosityColorMarker($message_verbosity);
@ -102,4 +100,6 @@
function log_value(mixed $value) { function log_value(mixed $value) {
log_debug(var_export($value, true)); log_debug(var_export($value, true));
} }
$LOGGING_VERBOSITY = LoggingVerbosity::Info;
?> ?>

Loading…
Cancel
Save