← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleadmin.cc

  • Committer: Monty Taylor
  • Date: 2009-02-08 11:28:58 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mordred@inaugust.com-20090208112858-aouo9w2okht5r6x0
ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleadmin.cc
200
200
  char **commands, **save_argv;
201
201
 
202
202
  MY_INIT(argv[0]);
203
 
  drizzle_create(&drizzle);
 
203
  drizzleclient_create(&drizzle);
204
204
  load_defaults("drizzle",load_default_groups,&argc,&argv);
205
205
  save_argv = argv;                             /* Save for free_defaults */
206
206
  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
225
225
  if (opt_connect_timeout)
226
226
  {
227
227
    uint tmp=opt_connect_timeout;
228
 
    drizzle_options(&drizzle,DRIZZLE_OPT_CONNECT_TIMEOUT, (char*) &tmp);
 
228
    drizzleclient_options(&drizzle,DRIZZLE_OPT_CONNECT_TIMEOUT, (char*) &tmp);
229
229
  }
230
230
 
231
231
  if (sql_connect(&drizzle, option_wait))
232
232
  {
233
 
    unsigned int err= drizzle_errno(&drizzle);
 
233
    unsigned int err= drizzleclient_errno(&drizzle);
234
234
    if (err >= CR_MIN_ERROR && err <= CR_MAX_ERROR)
235
235
      error= 1;
236
236
    else
249
249
  else
250
250
  {
251
251
    error=execute_commands(&drizzle,argc,commands);
252
 
    drizzle_close(&drizzle);
 
252
    drizzleclient_close(&drizzle);
253
253
  }
254
254
  free(opt_password);
255
255
  free(user);
269
269
 
270
270
  for (;;)
271
271
  {
272
 
    if (drizzle_connect(drizzle,host,user,opt_password,NULL,tcp_port,NULL,0))
 
272
    if (drizzleclient_connect(drizzle,host,user,opt_password,NULL,tcp_port,NULL,0))
273
273
    {
274
274
      drizzle->reconnect= 1;
275
275
      if (info)
288
288
          host= (char*) LOCAL_HOST;
289
289
 
290
290
        fprintf(stderr,_("connect to server at '%s' failed\nerror: '%s'"),
291
 
                host, drizzle_error(drizzle));
 
291
                host, drizzleclient_error(drizzle));
292
292
 
293
 
        if (drizzle_errno(drizzle) == CR_CONN_HOST_ERROR ||
294
 
          drizzle_errno(drizzle) == CR_UNKNOWN_HOST)
 
293
        if (drizzleclient_errno(drizzle) == CR_CONN_HOST_ERROR ||
 
294
          drizzleclient_errno(drizzle) == CR_UNKNOWN_HOST)
295
295
        {
296
296
          fprintf(stderr,_("Check that drizzled is running on %s"),host);
297
297
          fprintf(stderr,_(" and that the port is %d.\n"),
298
 
          tcp_port ? tcp_port: drizzle_get_default_port());
 
298
          tcp_port ? tcp_port: drizzleclient_get_default_port());
299
299
          fprintf(stderr,_("You can check this by doing 'telnet %s %d'\n"),
300
 
                  host, tcp_port ? tcp_port: drizzle_get_default_port());
 
300
                  host, tcp_port ? tcp_port: drizzleclient_get_default_port());
301
301
        }
302
302
      }
303
303
      return 1;
304
304
    }
305
305
    if (wait != UINT32_MAX)
306
306
      wait--;                           /* One less retry */
307
 
    if ((drizzle_errno(drizzle) != CR_CONN_HOST_ERROR) &&
308
 
        (drizzle_errno(drizzle) != CR_CONNECTION_ERROR))
 
307
    if ((drizzleclient_errno(drizzle) != CR_CONN_HOST_ERROR) &&
 
308
        (drizzleclient_errno(drizzle) != CR_CONNECTION_ERROR))
309
309
    {
310
 
      fprintf(stderr,_("Got error: %s\n"), drizzle_error(drizzle));
 
310
      fprintf(stderr,_("Got error: %s\n"), drizzleclient_error(drizzle));
311
311
    }
312
312
    else if (!option_silent)
313
313
    {
349
349
      if (opt_verbose)
350
350
        printf(_("shutting down drizzled...\n"));
351
351
 
352
 
      if (drizzle_shutdown(drizzle))
 
352
      if (drizzleclient_shutdown(drizzle))
353
353
      {
354
354
        fprintf(stderr, _("shutdown failed; error: '%s'"),
355
 
                drizzle_error(drizzle));
 
355
                drizzleclient_error(drizzle));
356
356
        return -1;
357
357
      }
358
 
      drizzle_close(drizzle);   /* Close connection to avoid error messages */
 
358
      drizzleclient_close(drizzle);     /* Close connection to avoid error messages */
359
359
 
360
360
      if (opt_verbose)
361
361
        printf(_("done\n"));
365
365
    }
366
366
    case ADMIN_PING:
367
367
      drizzle->reconnect=0;     /* We want to know of reconnects */
368
 
      if (!drizzle_ping(drizzle))
 
368
      if (!drizzleclient_ping(drizzle))
369
369
      {
370
370
        if (option_silent < 2)
371
371
          puts(_("drizzled is alive"));
372
372
      }
373
373
      else
374
374
      {
375
 
        if (drizzle_errno(drizzle) == CR_SERVER_GONE_ERROR)
 
375
        if (drizzleclient_errno(drizzle) == CR_SERVER_GONE_ERROR)
376
376
        {
377
377
          drizzle->reconnect=1;
378
 
          if (!drizzle_ping(drizzle))
 
378
          if (!drizzleclient_ping(drizzle))
379
379
            puts(_("connection was down, but drizzled is now alive"));
380
380
        }
381
381
        else
382
382
              {
383
383
          fprintf(stderr,_("drizzled doesn't answer to ping, error: '%s'"),
384
 
                  drizzle_error(drizzle));
 
384
                  drizzleclient_error(drizzle));
385
385
          return -1;
386
386
        }
387
387
      }
399
399
static void print_version(void)
400
400
{
401
401
  printf(_("%s  Ver %s Distrib %s, for %s on %s\n"),my_progname,ADMIN_VERSION,
402
 
         drizzle_get_client_info(),SYSTEM_TYPE,MACHINE_TYPE);
 
402
         drizzleclient_get_client_info(),SYSTEM_TYPE,MACHINE_TYPE);
403
403
}
404
404
 
405
405
static void usage(void)