eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- Linux server start script: removed welcome message, fix in server info

Browse source 
- removed command line outputs for Svg/Jpeg modes used
- use the default country if no country is given in the command line options
This commit is contained in:
Volker Fischer 2019-06-20 11:41:29 +02:00
parent 415a896897
commit b7df71e596
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
distributions/jamulus-server.service
View file

@ -8,7 +8,7 @@ Type=simple
Restart=always Restart=always
RestartSec=1 RestartSec=1
User=jamulus User=jamulus
ExecStart=/bin/bash -c '/usr/bin/jamulus -s -n --servername $(uname -n) -l /var/log/jamulus -e jamulus.fischvolk.de -g -w "Connected..." -o "$(uname -n);;;"' ExecStart=/bin/bash -c '/usr/bin/jamulus -s -n --servername $(uname -n) -l /var/log/jamulus -e jamulus.fischvolk.de -g -o "$(uname -n);;"'
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

8
src/historygraph.cpp
View file

@ -335,8 +335,8 @@ CJpegHistoryGraph::CJpegHistoryGraph() :
} }
// if all else fails, it's left at -1 // if all else fails, it's left at -1
QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() ); // QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() );
tsConsoleStream << "CJpegHistoryGraph" << endl; // on console // tsConsoleStream << "CJpegHistoryGraph" << endl; // on console
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
@ -411,8 +411,8 @@ CSvgHistoryGraph::CSvgHistoryGraph() :
svgRootAttributes.append ( "xmlns", "http://www.w3.org/2000/svg" ); svgRootAttributes.append ( "xmlns", "http://www.w3.org/2000/svg" );
svgRootAttributes.append ( "xmlns:xlink", "http://www.w3.org/1999/xlink" ); svgRootAttributes.append ( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() ); // QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() );
tsConsoleStream << "CSvgHistoryGraph" << endl; // on console // tsConsoleStream << "CSvgHistoryGraph" << endl; // on console
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------

3
src/serverlist.cpp
View file

@ -85,7 +85,8 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum,
// [this server country as QLocale ID] // [this server country as QLocale ID]
const int iCountry = slServInfoSeparateParams[2].toInt(); const int iCountry = slServInfoSeparateParams[2].toInt();
if ( ( iCountry >= 0 ) && ( iCountry <= QLocale::LastCountry ) )
if ( !slServInfoSeparateParams[2].isEmpty() && ( iCountry >= 0 ) && ( iCountry <= QLocale::LastCountry ) )
{ {
ThisServerListEntry.eCountry = static_cast<QLocale::Country> ( ThisServerListEntry.eCountry = static_cast<QLocale::Country> (
iCountry ); iCountry );