ReflectorLogic: New config variable VERBOSE

Add new configuration variable VERBOSE to the ReflectorLogic that
choose if printouts from the reflector logic should be verbose or not.
At the moment the only difference is that reflector join/leave messages
will be suppressed if VERBOSE=0.
This commit is contained in:
Tobias Blomberg 2022-01-14 18:17:04 +01:00
parent efc4e807ce
commit 4ce8e7893d
6 changed files with 22 additions and 4 deletions

View File

@ -710,6 +710,9 @@ instead of having to use DTMF commands. Note that the timer starts when the QSY
request is received so the time it takes to play the QSY announcement is also
included in the timeout time. A good value is within 10 to 15 seconds.
Default is -1 (disabled).
.TP
.B VERBOSE
Set to 0 to suppress reflector leave/join printouts.
.P
It is also possible to set audio codec parameters using the same configuration
variables as documented for networked receivers and transmitters. For example,

View File

@ -191,6 +191,11 @@
configuration variable will not be removed and it still work in the same
way.
* ReflectorLogic: New config variable VERBOSE that choose if printouts from
the reflector logic should be verbose or not. At the moment the only
difference is that reflector join/leave messages will be suppressed if
VERBOSE=0.
1.7.0 -- 01 Sep 2019

View File

@ -139,7 +139,7 @@ ReflectorLogic::ReflectorLogic(Async::Config& cfg, const std::string& name)
m_mute_first_tx_loc(true), m_mute_first_tx_rem(false),
m_tmp_monitor_timer(1000, Async::Timer::TYPE_PERIODIC),
m_tmp_monitor_timeout(DEFAULT_TMP_MONITOR_TIMEOUT), m_use_prio(true),
m_qsy_pending_timer(-1)
m_qsy_pending_timer(-1), m_verbose(true)
{
m_reconnect_timer.expired.connect(
sigc::hide(mem_fun(*this, &ReflectorLogic::reconnect)));
@ -179,6 +179,8 @@ ReflectorLogic::~ReflectorLogic(void)
bool ReflectorLogic::initialize(void)
{
cfg().getValue(name(), "VERBOSE", m_verbose);
if (!cfg().getValue(name(), "HOST", m_reflector_host))
{
cerr << "*** ERROR: " << name() << "/HOST missing in configuration" << endl;
@ -1057,7 +1059,10 @@ void ReflectorLogic::handleMsgNodeJoined(std::istream& is)
disconnect();
return;
}
cout << name() << ": Node joined: " << msg.callsign() << endl;
if (m_verbose)
{
std::cout << name() << ": Node joined: " << msg.callsign() << std::endl;
}
} /* ReflectorLogic::handleMsgNodeJoined */
@ -1070,7 +1075,10 @@ void ReflectorLogic::handleMsgNodeLeft(std::istream& is)
disconnect();
return;
}
cout << name() << ": Node left: " << msg.callsign() << endl;
if (m_verbose)
{
std::cout << name() << ": Node left: " << msg.callsign() << std::endl;
}
} /* ReflectorLogic::handleMsgNodeLeft */

View File

@ -256,6 +256,7 @@ class ReflectorLogic : public LogicBase
int m_tmp_monitor_timeout;
bool m_use_prio;
Async::Timer m_qsy_pending_timer;
bool m_verbose;
ReflectorLogic(const ReflectorLogic&);
ReflectorLogic& operator=(const ReflectorLogic&);

View File

@ -102,6 +102,7 @@ EVENT_HANDLER=@SVX_SHARE_INSTALL_DIR@/events.tcl
#TMP_MONITOR_TIMEOUT=3600
#UDP_HEARTBEAT_INTERVAL=15
QSY_PENDING_TIMEOUT=15
#VERBOSE=1
[LinkToR4]
CONNECT_LOGICS=RepeaterLogic:94:SK3AB,SimplexLogic:92:SK3CD

View File

@ -11,7 +11,7 @@ LIBECHOLIB=1.3.3.99.0
LIBASYNC=1.6.99.17
# SvxLink versions
SVXLINK=1.7.99.55
SVXLINK=1.7.99.56
MODULE_HELP=1.0.0
MODULE_PARROT=1.1.1
MODULE_ECHO_LINK=1.5.99.2