Sun, 04 Aug 2019 10:46:51 +0200
improve error handling and add some debug code in net_fallback_sendfile
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2017 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include "wstool.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include "../server/config/serverconf.h" #include "srvctrlsocket.h" static void print_info(char *cmd) { fprintf(stderr, "usage:\n"); fprintf(stderr, "%s -t <srvconfigfile>\n", cmd); fprintf(stderr, "%s -s <socketpath> <command>\n", cmd); fprintf(stderr, "Commands: reconfig, shutdown, stat, log\n"); } int main(int argc, char **argv) { if(argc > 2) { if(!strcmp(argv[1], "-t")) { return tool_get_tmpdir(argv[2]); } else if(!strcmp(argv[1], "-s")) { if(argc != 4) { print_info(argv[0]); return -2; } return tool_srvctrl(argv[2], argv[3]); } } print_info(argv[0]); return -2; } int tool_get_tmpdir(char *configfile) { ServerConfig *serverconf = load_server_config(configfile); UcxList *list = ucx_map_sstr_get(serverconf->objects, sstrn("Runtime", 7)); if(!list) { fprintf(stderr, "Error: No Runtime element in %s\n", configfile); return -1; } if(ucx_list_size(list) != 1) { fprintf(stderr, "Error: Multiple Runtime elements in %s\n", configfile); return -1; } ServerConfigObject *runtime = list->data; sstr_t tmp = cfg_directivelist_get_str(runtime->directives, sstr("Temp")); if(!tmp.ptr) { fprintf(stderr, "Error: No Temp directive in Runtime Object\n"); return -1; } printf("%.*s\n", (int)tmp.length, tmp.ptr); return 0; } int tool_srvctrl(char *socketfile, char *cmd) { SrvConnection *srv = srvctrl_connet(socketfile); if(!srv) { return -1; } fprintf(srv->stream, "%s\n", cmd); fflush(srv->stream); SrvMsg msg; while(!srvctrl_readmsg(srv, &msg)) { if(msg.type == 0) { fprintf(stdout, "%.*s", (int)msg.length, msg.message); fflush(stdout); } else if(msg.type == 1) { fprintf(stderr, "%.*s", (int)msg.length, msg.message); fflush(stderr); } } srvctrl_close(srv); return 0; } int log_ereport(int degree, const char *format, ...) { va_list args; va_start(args, format); int ret = log_ereport_v(degree, format, args); va_end(args); return ret; } int log_ereport_v(int degree, const char *format, va_list args) { return 0; }