MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-26 05:48:20 +02:00
Code Issues Releases Wiki Activity

modules/console: Add argument to peer version cmd to filter by expression.

Browse source
This commit is contained in:
Jason Volk 2023-03-18 16:34:43 -07:00
parent eca02723b3
commit 3709cda233
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/console.cc
View file

@ -4596,6 +4596,7 @@ static void
_print_sst_info_header(opt &out)
{
out << std::left << std::setfill(' ')
<< std::setw(6) << "path"
<< std::setw(12) << "name"
<< " " << std::setw(32) << "creation"
<< " " << std::setw(3) << "flt"
@ -4637,6 +4638,7 @@ _print_sst_info(opt &out,
char tmbuf[64], pbuf[48];
out << std::left << std::setfill(' ')
<< std::setw(6) << rsplit(f.path, '/').second
<< std::setw(12) << f.name
<< " " << std::setw(32) << std::left << (f.created? timef(tmbuf, f.created, ircd::localtime) : string_view{})
<< " " << std::setw(1) << std::left << (!f.filter.empty()? 'F' : '-')
@ -6130,6 +6132,21 @@ console_cmd__peer__error__clear(opt &out, const string_view &line)
bool
console_cmd__peer__version(opt &out, const string_view &line)
{
const params param{line, " ",
{
"[expression]"
}};
const bool expr
{
param["[expression]"] && param["[expression]"] != "*"
};
const globular_imatch match
{
param["[expression]"]
};
for(const auto &p : server::peers)
{
using std::setw;
@ -6137,9 +6154,15 @@ console_cmd__peer__version(opt &out, const string_view &line)
using std::right;
const auto &host{p.first};
if(expr)
{
const auto &[name, proto] (rsplit(host, ':'));
if(!match(host) && !match(name))
continue;
}
const auto &peer{*p.second};
const net::ipport &ipp{peer.remote};
out << setw(40) << right << host;
if(ipp)
@ -6150,9 +6173,10 @@ console_cmd__peer__version(opt &out, const string_view &line)
if(!empty(peer.server_version))
out << " :" << peer.server_version;
out << std::endl;
out << '\n';
}
out << std::endl;
return true;
}