Revision 5400c0e7 nest/proto.c

View differences:

nest/proto.c
512 512
	      else if (!p->disabled && nc->disabled)
513 513
		log(L_INFO "Disabling protocol %s", p->name);
514 514

  
515
	      PD(p, "Restarting");
516 515
	      p->down_code = nc->disabled ? PDC_CF_DISABLE : PDC_CF_RESTART;
517 516
	      p->cf_new = nc;
518 517
	    }
519
	  else
518
	  else if (!shutting_down)
520 519
	    {
521
	      if (!shutting_down)
522
		log(L_INFO "Removing protocol %s", p->name);
523
	      PD(p, "Unconfigured");
520
	      log(L_INFO "Removing protocol %s", p->name);
524 521
	      p->down_code = PDC_CF_REMOVE;
525 522
	      p->cf_new = NULL;
526 523
	    }
527
	  p->reconfiguring = 1;
524
	  else /* global shutdown */
525
	    {
526
	      p->down_code = PDC_CMD_SHUTDOWN;
527
	      p->cf_new = NULL;
528
	    }
528 529

  
530
	  p->reconfiguring = 1;
529 531
	  config_add_obstacle(old);
530 532
	  proto_rethink_goal(p);
531 533
	}

Also available in: Unified diff