Attachment #242273 for bug #271508




  /* How long to wait for graceful shutdown when we recieve a SIGTERM */
  #define TERMINATE_DEATH_WAIT	(2 * SECONDS)

  /* Used to prevent auto-up on links closed manually */
  enum {
    LINK_ADMINSTATE_DOWN = 0,
    LINK_ADMINSTATE_OPERATIONAL
  };

/*
 * GLOBAL VARIABLES
 */

	if (sig == SIGUSR1) {
	    Log(LG_ALWAYS, ("[%s] rec'd signal %s, opening",
    		l->name, sys_signame[sig]));
	    l->admin_state = LINK_ADMINSTATE_OPERATIONAL;
	    RecordLinkUpDownReason(NULL, l, 1, STR_MANUALLY, NULL);
	    LinkOpen(l);
	} else {
	    Log(LG_ALWAYS, ("[%s] rec'd signal %s, closing",
    		l->name, sys_signame[sig]));
	    l->admin_state = LINK_ADMINSTATE_DOWN;
	    RecordLinkUpDownReason(NULL, l, 0, STR_MANUALLY, NULL);
	    LinkClose(l);
	}

Return to bug 271508

Lines 83-88 Link Here

(-)src/main.c (+8 lines)
83	/* How long to wait for graceful shutdown when we recieve a SIGTERM */	83	/* How long to wait for graceful shutdown when we recieve a SIGTERM */
84	#define TERMINATE_DEATH_WAIT (2 * SECONDS)	84	#define TERMINATE_DEATH_WAIT (2 * SECONDS)
85		85
		86	/* Used to prevent auto-up on links closed manually */
		87	enum {
		88	LINK_ADMINSTATE_DOWN = 0,
		89	LINK_ADMINSTATE_OPERATIONAL
		90	};
		91
86	/*	92	/*
87	* GLOBAL VARIABLES	93	* GLOBAL VARIABLES
88	*/	94	*/
Lines 556-566 Link Here
556	if (sig == SIGUSR1) {	562	if (sig == SIGUSR1) {
557	Log(LG_ALWAYS, ("[%s] rec'd signal %s, opening",	563	Log(LG_ALWAYS, ("[%s] rec'd signal %s, opening",
558	l->name, sys_signame[sig]));	564	l->name, sys_signame[sig]));
		565	l->admin_state = LINK_ADMINSTATE_OPERATIONAL;
559	RecordLinkUpDownReason(NULL, l, 1, STR_MANUALLY, NULL);	566	RecordLinkUpDownReason(NULL, l, 1, STR_MANUALLY, NULL);
560	LinkOpen(l);	567	LinkOpen(l);
561	} else {	568	} else {
562	Log(LG_ALWAYS, ("[%s] rec'd signal %s, closing",	569	Log(LG_ALWAYS, ("[%s] rec'd signal %s, closing",
563	l->name, sys_signame[sig]));	570	l->name, sys_signame[sig]));
		571	l->admin_state = LINK_ADMINSTATE_DOWN;
564	RecordLinkUpDownReason(NULL, l, 0, STR_MANUALLY, NULL);	572	RecordLinkUpDownReason(NULL, l, 0, STR_MANUALLY, NULL);
565	LinkClose(l);	573	LinkClose(l);
566	}	574	}