AndyWhittaker
/
OpenPLC_v3
mirror of https://github.com/AndyWhittaker/OpenPLC_v3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Several fixes for services

This commit is contained in:
Garret Fick 2019-12-10 19:45:16 -05:00
parent f448868be1
commit 7288a3fe35
No known key found for this signature in database
GPG Key ID: 0F2FA2774E86EEFF
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/core/interactive_server.cpp
View File

@ -221,7 +221,7 @@ void interactive_client_command(const char* command, int client_fd)
return;
}
spdlog::trace("Process command received {}", command);
spdlog::trace("Command received {}", command);
if (strncmp(command, "quit()", 6) == 0)
{
@ -230,14 +230,14 @@ void interactive_client_command(const char* command, int client_fd)
}
else if (strncmp(command, "start_", 6) == 0)
{
char service_name[512];
auto config_start = get_service_name(command + 6, service_name, 512);
char service_name[MAX_SERVICE_NAME_SIZE];
auto config_start = get_service_name(command + 6, service_name, MAX_SERVICE_NAME_SIZE);
ServiceDefinition* def = services_find(service_name);
if (!def)
{
spdlog::error("Unrecognized service name {}", service_name);
int count_char = sprintf(command_buffer, "Error: unrecognized service name\n");
int count_char = sprintf(command_buffer, "Error: unrecognized service name '%s'\n", service_name);
write(client_fd, command_buffer, count_char);
return;
}
@ -246,16 +246,21 @@ void interactive_client_command(const char* command, int client_fd)
{
def->start(command_buffer);
}
else
{
spdlog::error("Unable to start service due {} to missing config", service_name);
}
}
else if (strncmp(command, "stop_", 5) == 0)
{
char service_name[512];
auto config_start = get_service_name(command + 6, service_name, 512);
char service_name[MAX_SERVICE_NAME_SIZE];
auto config_start = get_service_name(command + 5, service_name, MAX_SERVICE_NAME_SIZE);
ServiceDefinition* def = services_find(service_name);
if (!def)
{
int count_char = sprintf(command_buffer, "Error: unrecognized service name\n");
int count_char = sprintf(command_buffer, "Error: unrecognized service name '%s'\n", service_name);
write(client_fd, command_buffer, count_char);
return;
}
@ -264,7 +269,7 @@ void interactive_client_command(const char* command, int client_fd)
}
else if (strncmp(command, "runtime_logs()", 14) == 0)
{
spdlog::debug("Issued runtime_logs() command");
spdlog::trace("Issued runtime_logs() command");
std::string data = log_sink->data();
write(client_fd, data.c_str(), data.size());
return;
@ -279,6 +284,7 @@ void interactive_client_command(const char* command, int client_fd)
}
else
{
spdlog::error("Unrecognized command {}", command_buffer);
int count_char = sprintf(command_buffer, "Error: unrecognized command\n");
write(client_fd, command_buffer, count_char);
return;

4
runtime/core/service/service_registry.h
View File

@ -15,12 +15,16 @@
#ifndef RUNTIME_CORE_SERVICE_SERVICE_REGISTRY_H_
#define RUNTIME_CORE_SERVICE_SERVICE_REGISTRY_H_
#include <cstdint>
/** \addtogroup openplc_runtime
* @{
*/
class ServiceDefinition;
const std::size_t MAX_SERVICE_NAME_SIZE = 512;
/// @brief Finds the service in the registry by the name of the service.
/// @param name The identifier for the service.
/// @return The service if found, or nullptr if there is no such service.