Skip to content

Bikeshedding some code structures for reloadable plugins config #6488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Mar 6, 2020
Merged

Bikeshedding some code structures for reloadable plugins config #6488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions proxy/Plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,25 @@

#define MAX_PLUGIN_ARGS 64

static PluginDynamicReloadMode plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
static PluginDynamicReloadMode plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;

bool
isPluginDynamicReloadEnabled()
{
return plugin_dynamic_reload_mode == REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
return PluginDynamicReloadMode::RELOAD_ON == plugin_dynamic_reload_mode;
}

void
parsePluginDynamicReloadConfig()
{
int int_plugin_dynamic_reload_mode;

REC_ReadConfigInteger(int_plugin_dynamic_reload_mode, "proxy.config.plugin.dynamic_reload_mode");
plugin_dynamic_reload_mode = (PluginDynamicReloadMode)int_plugin_dynamic_reload_mode;
if (plugin_dynamic_reload_mode < PLUGIN_DYNAMIC_RELOAD_MODE_MIN || plugin_dynamic_reload_mode > PLUGIN_DYNAMIC_RELOAD_MODE_MAX) {
plugin_dynamic_reload_mode = static_cast<PluginDynamicReloadMode>(int_plugin_dynamic_reload_mode);

if (plugin_dynamic_reload_mode < 0 || plugin_dynamic_reload_mode >= PluginDynamicReloadMode::RELOAD_COUNT) {
Warning("proxy.config.plugin.dynamic_reload_mode out of range. using default value.");
plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;
}
Note("Initialized plugin_dynamic_reload_mode: %d", plugin_dynamic_reload_mode);
}
Expand Down
7 changes: 1 addition & 6 deletions proxy/Plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@
#include <string>
#include "tscore/List.h"

enum PluginDynamicReloadMode {
PLUGIN_DYNAMIC_RELOAD_MODE_MIN = 0,
PLUGIN_DYNAMIC_RELOAD_OFF = 0,
REMAP_PLUGIN_DYNAMIC_RELOAD_ON = 1,
PLUGIN_DYNAMIC_RELOAD_MODE_MAX = 1
};
typedef enum { RELOAD_OFF, RELOAD_ON, RELOAD_COUNT } PluginDynamicReloadMode;
Copy link
Member

@SolidWallOfCode SolidWallOfCode Mar 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Real bikeshedding would have done

enum class PluginDynamicReloadMode : uint8_t { RELOAD_OFF, RELOAD_ON, RELOAD_COUNT };


// read records.config to parse plugin related configs
void parsePluginConfig();
Expand Down
8 changes: 4 additions & 4 deletions proxy/http/remap/unit-tests/plugin_testing_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@ getTemporaryDir()
}

// implement functions to support unit-testing of option to enable/disable dynamic reload of plugins
static PluginDynamicReloadMode plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
static PluginDynamicReloadMode plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;

bool
isPluginDynamicReloadEnabled()
{
return plugin_dynamic_reload_mode == REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
return PluginDynamicReloadMode::RELOAD_ON == plugin_dynamic_reload_mode;
}

void
enablePluginDynamicReload()
{
plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;
}

void
disablePluginDynamicReload()
{
plugin_dynamic_reload_mode = PLUGIN_DYNAMIC_RELOAD_OFF;
plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_OFF;
}