Merge branch 'master' into staging

PageSpider.cpp

@@ -410,7 +410,7 @@ static bool generatePageHTML(CollectionRec *cr, SafeBuf *sb, const SafeBuf *dole
 		}
 	}
 	
-//	if(truncated_output)
+	if(truncated_output)
 		sb->safePrintf("<tr bgcolor=#%s><td colspan=3><center>&vellip;</center></td></tr>\n",
 		               LIGHT_BLUE);
 	

Parms.cpp

@@ -9985,7 +9985,7 @@ static bool s_inLoop = false;
 //   to all other hosts.
 // . he also sends to himself, if m_sendToGrunts is true
 bool Parms::doParmSendingLoop ( ) {
-
+	
 	if ( ! s_headNode ) return true;
 
 	if ( s_inLoop ) return true;
@@ -10006,7 +10006,7 @@ bool Parms::doParmSendingLoop ( ) {
 		// get it
 		Host *h = g_hostdb.getHost(i);
 
-		if(g_hostdb.isDead(h)) {
+		if(!g_conf.m_doingCommandLine && g_hostdb.isDead(h)) {
 			//If the host is dead we don't want to send it a parameter update. Just let the WaitEntry stick around
 			//and no log - it is too annoying
 			continue;

main.cpp

@@ -1734,6 +1734,10 @@ static       char  s_buffer[128];
 static HttpRequest s_r;
 bool doCmd ( const char *cmd , int32_t hostId , const char *filename ,
 	     bool sendToHosts , bool sendToProxies , int32_t hostId2 ) {
+
+	//so we don't supporess messages to dead hosts (we're not connected to vagus)
+	g_conf.m_doingCommandLine = true;
+
 	// need loop to work
 	if ( ! g_loop.init() ) {
 		log(LOG_WARN, "db: Loop init failed." );