oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

print more info out in error messages for shout

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2473 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-11-02 13:45:38 +00:00
parent 2c9b50cabd
commit 0298239770
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/audioOutputs/audioOutput_shout.c
View File

@ -212,7 +212,8 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
!= SHOUTERR_SUCCESS || != SHOUTERR_SUCCESS ||
shout_set_agent(sd->shoutConn, "MPD") != SHOUTERR_SUCCESS) shout_set_agent(sd->shoutConn, "MPD") != SHOUTERR_SUCCESS)
{ {
ERROR("error configuring shout: %s\n", ERROR("error configuring shout defined at line %i: %s\n",
param->line,
shout_get_error(sd->shoutConn)); shout_get_error(sd->shoutConn));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -307,10 +308,15 @@ static int myShout_handleError(ShoutData * sd, int err) {
break; break;
case SHOUTERR_UNCONNECTED: case SHOUTERR_UNCONNECTED:
case SHOUTERR_SOCKET: case SHOUTERR_SOCKET:
ERROR("Lost shout connection\n"); ERROR("Lost shout connection to %s:%i\n",
shout_get_host(sd->shoutConn),
shout_get_port(sd->shoutConn));
return -1; return -1;
default: default:
ERROR("shout: error: %s\n", shout_get_error(sd->shoutConn)); ERROR("shout: connection to %s:%i error : %s\n",
shout_get_host(sd->shoutConn),
shout_get_port(sd->shoutConn),
shout_get_error(sd->shoutConn));
return -1; return -1;
} }
@ -380,17 +386,20 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
ShoutData * sd = (ShoutData *)audioOutput->data; ShoutData * sd = (ShoutData *)audioOutput->data;
time_t t = time(NULL); time_t t = time(NULL);
sd->connAttempts++;
if(t - sd->lastAttempt < CONN_ATTEMPT_INTERVAL) { if(t - sd->lastAttempt < CONN_ATTEMPT_INTERVAL) {
return -1; return -1;
} }
sd->connAttempts++;
sd->lastAttempt = t; sd->lastAttempt = t;
if(shout_open(sd->shoutConn) != SHOUTERR_SUCCESS) { if(shout_open(sd->shoutConn) != SHOUTERR_SUCCESS) {
ERROR("problem opening connection to shout server (attempt %i):" ERROR("problem opening connection to shout server %s:%i "
" %s\n", sd->connAttempts, "(attempt %i): %s\n",
shout_get_host(sd->shoutConn),
shout_get_port(sd->shoutConn),
sd->connAttempts,
shout_get_error(sd->shoutConn)); shout_get_error(sd->shoutConn));
return -1; return -1;
} }