Browse Source

Make all applog at least 80 columns wide obviating the need for spaces at the end of select messages to clear the status line.

nfactor-troky
Con Kolivas 14 years ago
parent
commit
3d9f244e02
  1. 8
      main.c
  2. 11
      util.c

8
main.c

@ -821,7 +821,7 @@ static void *stage_thread(void *userdata)
if (want_longpoll) if (want_longpoll)
applog(LOG_WARNING, "New block detected, possible missed longpoll, flushing work queue"); applog(LOG_WARNING, "New block detected, possible missed longpoll, flushing work queue");
else else
applog(LOG_WARNING, "New block detected, flushing work queue "); applog(LOG_WARNING, "New block detected, flushing work queue");
/* As we can't flush the work from here, signal /* As we can't flush the work from here, signal
* the wakeup thread to restart all the * the wakeup thread to restart all the
* threads */ * threads */
@ -1083,7 +1083,7 @@ retry:
goto out; goto out;
} else if (localgen) { } else if (localgen) {
localgen = false; localgen = false;
applog(LOG_WARNING, "Resumed retrieving work from server "); applog(LOG_WARNING, "Resumed retrieving work from server");
} }
/* wait for 1st response, or get cached response */ /* wait for 1st response, or get cached response */
@ -1576,10 +1576,10 @@ static void *longpoll_thread(void *userdata)
* sure it's only done once per new block */ * sure it's only done once per new block */
if (likely(!strncmp(longpoll_block, blank, 36) || if (likely(!strncmp(longpoll_block, blank, 36) ||
!strncmp(longpoll_block, current_block, 36))) { !strncmp(longpoll_block, current_block, 36))) {
applog(LOG_WARNING, "LONGPOLL detected new block, flushing work queue "); applog(LOG_WARNING, "LONGPOLL detected new block, flushing work queue");
restart_threads(true); restart_threads(true);
} else } else
applog(LOG_WARNING, "LONGPOLL received - new block detected and work flushed already "); applog(LOG_WARNING, "LONGPOLL received - new block detected and work flushed already");
} else { } else {
if (failures++ < 10) { if (failures++ < 10) {
sleep(30); sleep(30);

11
util.c

@ -68,7 +68,7 @@ void vapplog(int prio, const char *fmt, va_list ap)
#endif #endif
else if (opt_log_output || prio == LOG_WARNING || prio == LOG_ERR) { else if (opt_log_output || prio == LOG_WARNING || prio == LOG_ERR) {
char *f; char *f;
int len; int len, i, extra = 0;
struct timeval tv = { }; struct timeval tv = { };
struct tm tm, *tm_p; struct tm tm, *tm_p;
@ -80,8 +80,10 @@ void vapplog(int prio, const char *fmt, va_list ap)
pthread_mutex_unlock(&time_lock); pthread_mutex_unlock(&time_lock);
len = 40 + strlen(fmt) + 2; len = 40 + strlen(fmt) + 2;
f = alloca(len); if (len < 80)
sprintf(f, "[%d-%02d-%02d %02d:%02d:%02d] %s\n", extra = 80 - len;
f = alloca(len + extra);
sprintf(f, "[%d-%02d-%02d %02d:%02d:%02d] %s",
tm.tm_year + 1900, tm.tm_year + 1900,
tm.tm_mon + 1, tm.tm_mon + 1,
tm.tm_mday, tm.tm_mday,
@ -90,6 +92,9 @@ void vapplog(int prio, const char *fmt, va_list ap)
tm.tm_sec, tm.tm_sec,
fmt); fmt);
vfprintf(stderr, f, ap); /* atomic write to stderr */ vfprintf(stderr, f, ap); /* atomic write to stderr */
for (i = 0; i < extra; i++)
fprintf(stderr, " ");
fprintf(stderr, "\n");
fflush(stderr); fflush(stderr);
} }
} }

Loading…
Cancel
Save