kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 18:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

medix_index: Display errors when library calls fail

Browse Source 
Based on feedback from ipengineer in #asterisk, when the media indexer
cannot access a sound file on the system (or otherwise fails) Asterisk
displays a "Cannot frob file" error but fails to tell you why. This is
especially problematic as the media_indexer failing will rpevent Asterisk
from starting, as it is in the core.

We now display the errno error messages so folks can figure out what they've
done wrong.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@402285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-10-31 15:51:36 +00:00
parent a181e534e0
commit f8cd9b61f6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/media_index.c
View File

@@ -394,7 +394,7 @@ static int process_description_file(struct ast_media_index *index,
} }
f = fopen(ast_str_buffer(description_file_path), "r"); f = fopen(ast_str_buffer(description_file_path), "r");
if (!f) { if (!f) {
ast_log(LOG_WARNING, "Could not open media description file '%s'\n", ast_str_buffer(description_file_path)); ast_log(LOG_WARNING, "Could not open media description file '%s': %s\n", ast_str_buffer(description_file_path), strerror(errno));
return -1; return -1;
} }
@@ -402,7 +402,7 @@ static int process_description_file(struct ast_media_index *index,
char *file_identifier, *description; char *file_identifier, *description;
if (!fgets(buf, sizeof(buf), f)) { if (!fgets(buf, sizeof(buf), f)) {
if (ferror(f)) { if (ferror(f)) {
ast_log(LOG_ERROR, "Error reading from file %s\n", ast_str_buffer(description_file_path)); ast_log(LOG_ERROR, "Error reading from file %s: %s\n", ast_str_buffer(description_file_path), strerror(errno));
} }
continue; continue;
} }
@@ -416,7 +416,7 @@ static int process_description_file(struct ast_media_index *index,
} }
} }
if (ferror(f)) { if (ferror(f)) {
ast_log(LOG_ERROR, "Error reading from file %s\n", ast_str_buffer(description_file_path)); ast_log(LOG_ERROR, "Error reading from file %s: %s\n", ast_str_buffer(description_file_path), strerror(errno));
} }
continue; continue;
} }
@@ -536,7 +536,7 @@ static int media_index_update(struct ast_media_index *index,
srcdir = opendir(ast_str_buffer(index_dir)); srcdir = opendir(ast_str_buffer(index_dir));
if (srcdir == NULL) { if (srcdir == NULL) {
ast_log(LOG_ERROR, "Failed to open %s\n", ast_str_buffer(index_dir)); ast_log(LOG_ERROR, "Failed to open %s: %s\n", ast_str_buffer(index_dir), strerror(errno));
return -1; return -1;
} }
@@ -551,7 +551,7 @@ static int media_index_update(struct ast_media_index *index,
ast_str_set(&statfile, 0, "%s/%s", ast_str_buffer(index_dir), dent->d_name); ast_str_set(&statfile, 0, "%s/%s", ast_str_buffer(index_dir), dent->d_name);
if (stat(ast_str_buffer(statfile), &st) < 0) { if (stat(ast_str_buffer(statfile), &st) < 0) {
ast_log(LOG_ERROR, "Failed to stat %s\n", ast_str_buffer(statfile)); ast_log(LOG_ERROR, "Failed to stat %s: %s\n", ast_str_buffer(statfile), strerror(errno));
res = -1; res = -1;
break; break;
} }