Merge it :)

On Jul 9, 2013, at 12:26 PM, David Shrewsbury <email address hidden> wrote:

> David Shrewsbury has proposed merging lp:~dshrews/gearmand/gearman_cli_ssl into lp:gearmand.
> 
> Requested reviews:
>  Brian Aker (brianaker)
> 
> For more details, see:
> https://code.launchpad.net/~dshrews/gearmand/gearman_cli_ssl/+merge/173797
> 
> Adds a -S option for the 'gearman' CLI client.
> 
> Currently, it just uses the compiled in location for the keys (or the ENV overrides). I want to add command line options to specify the locations in a future branch rather than this one.
> -- 
> https://code.launchpad.net/~dshrews/gearmand/gearman_cli_ssl/+merge/173797
> You are requested to review the proposed merge of lp:~dshrews/gearmand/gearman_cli_ssl into lp:gearmand.
> === modified file 'bin/arguments.cc'
> --- bin/arguments.cc	2013-04-29 14:05:49 +0000
> +++ bin/arguments.cc	2013-07-09 19:25:31 +0000
> @@ -71,6 +71,7 @@
>   _daemon(false),
>   _usage(false),
>   _is_error(false),
> +  _use_ssl(false),
>   _arg_error(NULL),
>   _priority(GEARMAN_JOB_PRIORITY_NORMAL),
>   _timeout(-1),
> @@ -91,7 +92,7 @@
> 
>   opterr= 0;
> 
> -  while ((c = getopt(argc, argv, "bc:f:h:HILnNp:Pst:u:vwi:d")) != -1)
> +  while ((c = getopt(argc, argv, "bc:f:h:HILnNp:Pst:u:vwi:dS")) != -1)
>   {
>     switch(c)
>     {
> @@ -168,6 +169,10 @@
>       _verbose= true;
>       break;
> 
> +    case 'S':
> +      _use_ssl= true;
> +      break;
> +
>     default:
>       _is_error= true;
> 
> 
> === modified file 'bin/arguments.h'
> --- bin/arguments.h	2013-04-29 14:05:49 +0000
> +++ bin/arguments.h	2013-07-09 19:25:31 +0000
> @@ -161,6 +161,11 @@
>     return _suppress_input;
>   }
> 
> +  bool use_ssl() const
> +  {
> +    return _use_ssl;
> +  }
> +
>   const char *argument(size_t arg)
>   {
>     return argv[arg];
> @@ -220,6 +225,7 @@
>   bool _daemon;
>   bool _usage;
>   bool _is_error;
> +  bool _use_ssl;
>   char *_arg_error;
>   gearman_job_priority_t _priority;
>   int _timeout;
> 
> === modified file 'bin/gearman.cc'
> --- bin/gearman.cc	2013-03-15 21:54:07 +0000
> +++ bin/gearman.cc	2013-07-09 19:25:31 +0000
> @@ -263,6 +263,11 @@
>     return;
>   }
> 
> +  if (args.use_ssl())
> +  {
> +    gearman_client_add_options(&client, GEARMAN_CLIENT_SSL);
> +  }
> +
>   gearman_client_set_created_fn(&client, _client_created);
>   gearman_client_set_data_fn(&client, _client_data);
>   gearman_client_set_warning_fn(&client, _client_warning);
> @@ -520,6 +525,11 @@
>     _exit(EXIT_FAILURE);
>   }
> 
> +  if (args.use_ssl())
> +  {
> +    gearman_worker_add_options(&worker, GEARMAN_WORKER_SSL);
> +  }
> +
>   gearman_worker_set_workload_free_fn(&worker, _worker_free, NULL);
> 
>   for (Function::vector::iterator iter= args.begin(); 
> @@ -784,6 +794,7 @@
>   fprintf(stream, "\t-p <port>     - Job server port\n");
>   fprintf(stream, "\t-t <timeout>  - Timeout in milliseconds\n");
>   fprintf(stream, "\t-i <pidfile>  - Create a pidfile for the process\n");
> +  fprintf(stream, "\t-S            - Enable SSL connections\n");
> 
>   fprintf(stream, "\nClient options:\n");
>   fprintf(stream, "\t-b            - Run jobs in the background(%s)\n", args.background() ? "true" : "false");
>