Commit e0e90bb9 authored by Greg Williams's avatar Greg Williams
Browse files

Fixed Makefile to use new kinetic-c-util API and added some more tests. 

Moved some basic connection logging output to log_level 1 to reduce unnecessary output at level 0.
parent a124a762

Makefile

+9 −2
Original line number Diff line number Diff line
@@ -429,8 +429,15 @@ run: $(UTIL_EXEC) 
	@echo --------------------------------------------------------------------------------

	@echo

	# $(UTIL_EXEC) instanterase

	$(UTIL_EXEC) noop

	exec $(UTIL_EXEC) put get delete

	exec $(UTIL_EXEC) --help

	exec $(UTIL_EXEC) -?

	exec $(UTIL_EXEC) --noop

	exec $(UTIL_EXEC) --put

	exec $(UTIL_EXEC) --get

	exec $(UTIL_EXEC) --getnext key ""

	exec $(UTIL_EXEC) --getprevious key ""

	exec $(UTIL_EXEC) --delete

	exec $(UTIL_EXEC) --getlog

	@echo

	@echo Test Utility integration tests w/ kinetic-c lib passed!

	@echo

src/lib/kinetic_logger.c

+6 −2
Original line number Diff line number Diff line
@@ -66,11 +66,15 @@ void KineticLogger_Init(const char* log_file, int log_level) 
        KineticLogLevel = log_level;

        

        if (strncmp(log_file, "stdout", 4) == 0 || strncmp(log_file, "STDOUT", 4) == 0) {

            if (log_level > 0) {

                printf("Logging kinetic-c output to console (stdout) w/ log_level=%d\n", KineticLogLevel);

            }

            KineticLoggerHandle = stdout;

        }

        else {

            if (log_level > 0) {

                printf("Logging kinetic-c output to %s w/ log_level=%d\n", log_file, KineticLogLevel);

            }

            KineticLoggerHandle = fopen(log_file, "a+");

            KINETIC_ASSERT(KineticLoggerHandle != NULL);

        }

src/lib/kinetic_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int KineticSocket_Connect(const char* host, int port) 
    sprintf(port_str, "%d", port);



    // Open socket

    LOGF0("Connecting to %s:%d", host, port);

    LOGF1("Connecting to %s:%d", host, port);

    if (!socket99_open(&cfg, &result)) {

        char err_buf[256];

        socket99_snprintf(err_buf, 256, &result);

src/utility/main.c

+20 −36
Original line number Diff line number Diff line
@@ -119,62 +119,44 @@ static const char* GetOptString(OptionID opt_id); 


void PrintUsage(const char* exec)

{

    fprintf(stderr,

      "Usage: %s --<cmd> [options...]\n", exec);

    printf("Usage: %s --<cmd> [options...]\n", exec);

    

    // Standard API operations

    fprintf(stderr,

      "%s --noop"

    printf("%s --noop"

      " [--host <ip|hostname>] [--port <port>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --put [--key <key>] [--value <value>]"

    printf("%s --put [--key <key>] [--value <value>]"

      " [--host <ip|hostname>] [--port <port>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --get [--key <key>]"

    printf("%s --get [--key <key>]"

      " [--host <ip|hostname>] [--port <port>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --getnext [--key <key>]"

    printf("%s --getnext [--key <key>]"

      " [--host <ip|hostname>] [--port <port>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --getprevious [--key <key>]"

    printf("%s --getprevious [--key <key>]"

      " [--host <ip|hostname>] [--port <port>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --delete [--key <key>]"

    printf("%s --delete [--key <key>]"

      " [--host <ip|hostname>] [--port <port>] [--clusterversion <clusterversion>]\n", exec);

    

    // Admin API operations

    fprintf(stderr,

      "%s --setclusterversion <--newclusterversion <newclusterversion>>"

    printf("%s --setclusterversion <--newclusterversion <newclusterversion>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --seterasepin <--pin <oldpin>> <--newpin <newerasepin>>"

    printf("%s --seterasepin <--pin <oldpin>> <--newpin <newerasepin>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --instanterase <--pin <erasepin>>"

    printf("%s --instanterase <--pin <erasepin>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --secureerase <--pin <erasepin>>"

    printf("%s --secureerase <--pin <erasepin>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --setlockpin <--pin <oldpin>> <--newpin <newpin>>"

    printf("%s --setlockpin <--pin <oldpin>> <--newpin <newpin>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --lockdevice <--pin <lockpin>>"

    printf("%s --lockdevice <--pin <lockpin>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --unlockdevice <--pin <lockpin>>"

    printf("%s --unlockdevice <--pin <lockpin>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --setacl <--file <acl_json_file>>"

    printf("%s --setacl <--file <acl_json_file>>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --getlog [--type <utilization|temperature|capacity|configuration|message|statistic|limits>"

    printf("%s --getlog [--type <utilization|temperature|capacity|configuration|message|statistic|limits>"

      " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    // fprintf(stderr,

    //   "%s --getvendorspecificdevicelog <--name <vendorspecificname>>"

    // printf("%s --getvendorspecificdevicelog <--name <vendorspecificname>>"

    //   " [--host <ip|hostname>] [--tlsport <tlsport>] [--clusterversion <clusterversion>]\n", exec);

    fprintf(stderr,

      "%s --updatefirmware <--file <file>>"

    printf("%s --updatefirmware <--file <file>>"

      " [--host <ip|hostname>] [--port <port>] [--clusterversion <clusterversion>] [--pin <pin>]\n", exec);

}
@@ -696,6 +678,8 @@ int ParseOptions( 
                exit(-1);



            case OPT_HELP:

                PrintUsage(argv[0]);

                exit(0);

            default:

                PrintUsage(argv[0]);

                exit(-1);