aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-06-02 06:01:10 +00:00
Code

Update: Do not report for no definition in report db if no db has been loaded

Browse Source
This commit is contained in:
Philipp Schafft 2023-03-13 13:36:53 +00:00
parent 7f6abb6ca8
commit 6f2540426a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/reportxml.c
View File

@ -15,6 +15,7 @@
#endif
#include <string.h>
#include <stdbool.h>
#include "common/thread/thread.h"
#include "common/avl/avl.h"
@ -62,6 +63,7 @@ struct reportxml_database_tag {
mutex_t lock;
/* The tree of definitions */
avl_tree *definitions;
bool loaded;
};
/* The nodeattr structure is used to store definition of node attributes */
@ -1061,6 +1063,8 @@ int reportxml_database_add_report(reportxml_database_t *db,
avl_insert(db->definitions, copy);
}
db->loaded = true;
thread_mutex_unlock(&(db->lock));
refobject_unref(root);
@ -1310,7 +1314,10 @@ reportxml_t * reportxml_database_build_report(reportxml_database_t *db
/* first find the definition itself. This will be some REPORTXML_NODE_TYPE_DEFINITION node. */
definition = __reportxml_database_build_node_ext(db, id, depth, &type);
if (!definition) {
ICECAST_LOG_WARN("No matching definition for \"%H\"", id);
if (db->loaded) {
/* we ignore the log for db->loaded here as is most unlikely that we read a wrong value here AND this is just a diagnostic message */
ICECAST_LOG_WARN("No matching definition for \"%H\"", id);
}
return NULL;
}
@ -1435,7 +1442,10 @@ reportxml_node_t * reportxml_database_build_fragment(reportxml_database_t *
/* first find the definition itself. This will be some REPORTXML_NODE_TYPE_DEFINITION node. */
definition = __reportxml_database_build_node_ext(db, id, depth, &got);
if (!definition) {
ICECAST_LOG_WARN("No matching definition for \"%H\"", id);
if (db->loaded) {
/* we ignore the log for db->loaded here as is most unlikely that we read a wrong value here AND this is just a diagnostic message */
ICECAST_LOG_WARN("No matching definition for \"%H\"", id);
}
return NULL;
}