Skip to content

TS-4060 Adds JSON support consistently for traffic_layout #417

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

Closed
zwoop wants to merge 1 commit into from
Closed

TS-4060 Adds JSON support consistently for traffic_layout #417

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
59 changes: 36 additions & 23 deletions cmd/traffic_layout/traffic_layout.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,38 +126,51 @@ produce_features(bool json)


static void
print_var(const char *name, char *val)
print_var(const char *name, char *value, bool json, bool free = true, bool last = false)
{
printf("%s: %s\n", name, val);
ats_free(val);
if (json) {
printf(" \"%s\": \"%s\"%s", name, value, last ? "\n" : ",\n");
} else {
printf("%s: %s\n", name, value);
}

if (free) {
ats_free(value);
}
}

static void
produce_layout()
produce_layout(bool json)
{
Layout::create();

RecProcessInit(RECM_STAND_ALONE, NULL /* diags */);
LibRecordsConfigInit();

printf("%s: %s\n", "PREFIX", Layout::get()->prefix);
print_var("BINDIR", RecConfigReadBinDir());
print_var("SYSCONFDIR", RecConfigReadConfigDir());
print_var("LIBDIR", Layout::get()->libdir);
print_var("LOGDIR", RecConfigReadLogDir());
print_var("RUNTIMEDIR", RecConfigReadRuntimeDir());
print_var("PLUGINDIR", RecConfigReadPrefixPath("proxy.config.plugin.plugin_dir"));
print_var("INCLUDEDIR", Layout::get()->includedir);
print_var("SNAPSHOTDIR", RecConfigReadSnapshotDir());

print_var("records.config", RecConfigReadConfigPath(NULL, REC_CONFIG_FILE));
print_var("remap.config", RecConfigReadConfigPath("proxy.config.url_remap.filename"));
print_var("plugin.config", RecConfigReadConfigPath(NULL, "plugin.config"));
print_var("ssl_multicert.config", RecConfigReadConfigPath("proxy.config.ssl.server.multicert.filename"));
print_var("storage.config", RecConfigReadConfigPath("proxy.config.cache.storage_filename"));
print_var("hosting.config", RecConfigReadConfigPath("proxy.config.cache.hosting_filename"));
print_var("volume.config", RecConfigReadConfigPath("proxy.config.cache.volume_filename"));
print_var("ip_allow.config", RecConfigReadConfigPath("proxy.config.cache.ip_allow.filename"));
if (json) {
printf("{\n");
}
print_var("PREFIX", Layout::get()->prefix, json, false); // Don't free this
print_var("BINDIR", RecConfigReadBinDir(), json);
print_var("SYSCONFDIR", RecConfigReadConfigDir(), json);
print_var("LIBDIR", Layout::get()->libdir, json, false); // Don't free this
print_var("LOGDIR", RecConfigReadLogDir(), json);
print_var("RUNTIMEDIR", RecConfigReadRuntimeDir(), json);
print_var("PLUGINDIR", RecConfigReadPrefixPath("proxy.config.plugin.plugin_dir"), json);
print_var("INCLUDEDIR", Layout::get()->includedir, json, false); // Dont' free this
print_var("SNAPSHOTDIR", RecConfigReadSnapshotDir(), json);

print_var("records.config", RecConfigReadConfigPath(NULL, REC_CONFIG_FILE), json);
print_var("remap.config", RecConfigReadConfigPath("proxy.config.url_remap.filename"), json);
print_var("plugin.config", RecConfigReadConfigPath(NULL, "plugin.config"), json);
print_var("ssl_multicert.config", RecConfigReadConfigPath("proxy.config.ssl.server.multicert.filename"), json);
print_var("storage.config", RecConfigReadConfigPath("proxy.config.cache.storage_filename"), json);
print_var("hosting.config", RecConfigReadConfigPath("proxy.config.cache.hosting_filename"), json);
print_var("volume.config", RecConfigReadConfigPath("proxy.config.cache.volume_filename"), json);
print_var("ip_allow.config", RecConfigReadConfigPath("proxy.config.cache.ip_allow.filename"), json, true, true);
if (json) {
printf("}\n");
}
}

int
Expand All @@ -173,7 +186,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
if (cl.features) {
produce_features(0 != cl.json);
} else {
produce_layout();
produce_layout(0 != cl.json);
}
exit(0);
}