Browse Source

MT#55283 use explicit started flag

Metadata might be empty, so we can't rely on that being set as a start
trigger. Use an explicit one.

Follow-up-to: I3bb58dff
Change-Id: I95f02a1179940cedc3f96ce70557658c43e79bdc
pull/1993/head
Richard Fuchs 3 months ago
parent
commit
0548168a0a
4 changed files with 9 additions and 3 deletions
  1. +3
    -0
      daemon/recording.c
  2. +1
    -1
      recording-daemon/db.c
  3. +4
    -2
      recording-daemon/metafile.c
  4. +1
    -0
      recording-daemon/types.h

+ 3
- 0
daemon/recording.c View File

@ -301,6 +301,9 @@ void update_metadata_call(call_t *call, const sdp_ng_flags *flags) {
update_call_field(call, &call->recording_path, flags ? &flags->recording_path : NULL, "RECORDING_PATH");
update_call_field(call, &call->recording_pattern, flags ? &flags->recording_pattern : NULL,
"RECORDING_PATTERN");
if (call->recording)
append_meta_chunk_null(call->recording, "STARTED");
}
// lock must be held


+ 1
- 1
recording-daemon/db.c View File

@ -260,7 +260,7 @@ static void db_do_call_id(metafile_t *mf) {
return;
if (mf->skip_db)
return;
if (!mf->metadata)
if (!mf->started)
return;
MYSQL_BIND b[2];


+ 4
- 2
recording-daemon/metafile.c View File

@ -103,7 +103,7 @@ static void meta_mix_file_output(metafile_t *mf) {
return;
}
if (!mf->metadata)
if (!mf->started)
return;
if (!mf->mix) {
@ -128,7 +128,7 @@ static void meta_mix_tls_output(metafile_t *mf) {
mf->tls_mix = NULL;
}
if (!mf->metadata)
if (!mf->started)
return;
if (!mf->forwarding_on)
return;
@ -317,6 +317,8 @@ static void meta_section(metafile_t *mf, char *section, char *content, unsigned
mf->output_pattern = g_string_chunk_insert(mf->gsc, content);
else if (!strcmp(section, "SKIP_DATABASE"))
mf->skip_db = 1;
else if (!strcmp(section, "STARTED"))
mf->started = 1;
db_do_call(mf);
meta_mix_output(mf);


+ 1
- 0
recording-daemon/types.h View File

@ -188,6 +188,7 @@ struct metafile_s {
unsigned int discard:1;
unsigned int db_metadata_done:1;
unsigned int skip_db:1;
unsigned int started:1;
};


Loading…
Cancel
Save