stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

subscription: add profile name to creating subscription log

Browse source
This commit is contained in:
Jaroslav Kysela 2014-11-02 13:27:12 +01:00
parent c053acd84e
commit 409b0140c6
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/htsp_server.c
View file

@ -1791,7 +1791,8 @@ htsp_method_subscribe(htsp_connection_t *htsp, htsmsg_t *in)
*/
LIST_INSERT_HEAD(&htsp->htsp_subscriptions, hs, hs_link);
tvhdebug("htsp", "%s - subscribe to %s\n", htsp->htsp_logname, ch->ch_name ?: "");
tvhdebug("htsp", "%s - subscribe to %s using profile %s\n",
htsp->htsp_logname, channel_get_name(ch), pro->pro_name ?: "");
hs->hs_s = subscription_create_from_channel(&hs->hs_prch, weight,
htsp->htsp_logname,
SUBSCRIPTION_STREAMING,

11
src/subscriptions.c
View file

@ -647,11 +647,14 @@ subscription_create_from_channel_or_service(profile_chain_t *prch,
th_subscription_t *s;
channel_t *ch = NULL;
service_t *t = NULL;
const char *pro_name;
assert(prch);
assert(prch->prch_id);
assert(prch->prch_st);
pro_name = prch->prch_pro ? (prch->prch_pro->pro_name ?: "") : "<none>";
if (service)
t = prch->prch_id;
else
@ -660,11 +663,11 @@ subscription_create_from_channel_or_service(profile_chain_t *prch,
s = subscription_create(prch, weight, name, flags, subscription_input,
hostname, username, client);
if (ch)
tvhtrace("subscription", "%04X: creating subscription for %s weight %d",
shortid(s), channel_get_name(ch), weight);
tvhtrace("subscription", "%04X: creating subscription for %s weight %d using profile %s",
shortid(s), channel_get_name(ch), weight, pro_name);
else
tvhtrace("subscription", "%04X: creating subscription for service %s weight %d",
shortid(s), t->s_nicename, weight);
tvhtrace("subscription", "%04X: creating subscription for service %s weight %d sing profile %s",
shortid(s), t->s_nicename, weight, pro_name);
s->ths_channel = ch;
s->ths_service = t;
if (ch)