From 44f20713db06c83d7a820056bed84ceaee6b4abb Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Tue, 30 Apr 2013 15:10:45 +0100 Subject: [PATCH] service: fix mistake causing service startup to report incorrectly. --- src/service.c | 2 +- src/subscriptions.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/service.c b/src/service.c index 462449ac..a38d2b06 100644 --- a/src/service.c +++ b/src/service.c @@ -295,7 +295,7 @@ service_find_instance(channel_t *ch, struct service_instance_list *sil, } service_start(si->si_s, si->si_instance); - return NULL; + return si; } diff --git a/src/subscriptions.c b/src/subscriptions.c index 3fdada41..a980badb 100644 --- a/src/subscriptions.c +++ b/src/subscriptions.c @@ -180,6 +180,7 @@ subscription_reschedule(void) time(&si->si_error_time); } + tvhtrace("subscription", "find service for %s weight %d", s->ths_channel->ch_name, s->ths_weight); si = service_find_instance(s->ths_channel, &s->ths_instances, &error, s->ths_weight); s->ths_current_instance = si; @@ -377,6 +378,8 @@ subscription_create_from_channel(channel_t *ch, unsigned int weight, { th_subscription_t *s; + tvhtrace("subscription", "creating subscription for %s weight %d", + ch->ch_name, weight); s = subscription_create(weight, name, st, flags, subscription_input, hostname, username, client);