mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
6fbfda03fa
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config
Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process
* reversing errant change to hyperion.systemd.sh
* added bonjour/zeroconf service discovery to the json interface.
When clients are also modified, they can
- find hyperiond on the network much more quickly than ping/portscan;
- find multiple instances running on different ports instead of assuming 19444
* Moved zeroconf calls to hyperiond.cpp
* Added mDNS/zerconf/bonjour registration for proto server
Added config options.
"jsonServer" :
{
"port" : 49444,
// "mDNSDescr" : "hyperiond jsonServer blah de blah",
"mDNSService" : "_hyperiond_json._tcp"
},
* cleaned up a couple of compiler warnings
* moved bitpair_to_byte initialiser to (hopefully) work with older GCC
* compiler warning in udp driver
removed some tabs in ws2812b.cpp
* formatting - spaces to tabs
* moved rpi_281x to tag sk6812-v1.0
* moving to my fork of rpi_281x
* Now uses the led device name and hostname to create the annouce name
Former-commit-id: abfa51bcf359cafa63338181c1b83ecfd231bc87
70 lines
1.9 KiB
C++
70 lines
1.9 KiB
C++
// system includes
|
|
#include <stdexcept>
|
|
|
|
// project includes
|
|
#include <jsonserver/JsonServer.h>
|
|
#include "JsonClientConnection.h"
|
|
|
|
JsonServer::JsonServer(Hyperion *hyperion, uint16_t port) :
|
|
QObject(),
|
|
_hyperion(hyperion),
|
|
_server(),
|
|
_openConnections()
|
|
{
|
|
if (!_server.listen(QHostAddress::Any, port))
|
|
{
|
|
throw std::runtime_error("JSONSERVER ERROR: could not bind to port");
|
|
}
|
|
|
|
QList<MessageForwarder::JsonSlaveAddress> list = _hyperion->getForwarder()->getJsonSlaves();
|
|
for ( int i=0; i<list.size(); i++ )
|
|
{
|
|
if ( list.at(i).addr == QHostAddress::LocalHost && list.at(i).port == port ) {
|
|
throw std::runtime_error("JSONSERVER ERROR: Loop between proto server and forwarder detected. Fix your config!");
|
|
}
|
|
}
|
|
|
|
// Set trigger for incoming connections
|
|
connect(&_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
|
|
|
|
// make sure the resources are loaded (they may be left out after static linking
|
|
Q_INIT_RESOURCE(JsonSchemas);
|
|
|
|
}
|
|
|
|
JsonServer::~JsonServer()
|
|
{
|
|
foreach (JsonClientConnection * connection, _openConnections) {
|
|
delete connection;
|
|
}
|
|
}
|
|
|
|
uint16_t JsonServer::getPort() const
|
|
{
|
|
return _server.serverPort();
|
|
}
|
|
|
|
void JsonServer::newConnection()
|
|
{
|
|
QTcpSocket * socket = _server.nextPendingConnection();
|
|
|
|
if (socket != nullptr)
|
|
{
|
|
std::cout << "JSONSERVER INFO: New connection" << std::endl;
|
|
JsonClientConnection * connection = new JsonClientConnection(socket, _hyperion);
|
|
_openConnections.insert(connection);
|
|
|
|
// register slot for cleaning up after the connection closed
|
|
connect(connection, SIGNAL(connectionClosed(JsonClientConnection*)), this, SLOT(closedConnection(JsonClientConnection*)));
|
|
}
|
|
}
|
|
|
|
void JsonServer::closedConnection(JsonClientConnection *connection)
|
|
{
|
|
std::cout << "JSONSERVER INFO: Connection closed" << std::endl;
|
|
_openConnections.remove(connection);
|
|
|
|
// schedule to delete the connection object
|
|
connection->deleteLater();
|
|
}
|