From e33dabee8b6918a1541c87c92157282f6aa9d34b Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Sun, 1 Dec 2013 22:35:10 +0000
Subject: [PATCH] service: report better status responses when subscription
 fails

---
 src/service.c       | 7 +++++--
 src/subscriptions.c | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/service.c b/src/service.c
index 81ccf77c..13a97cd2 100644
--- a/src/service.c
+++ b/src/service.c
@@ -417,7 +417,8 @@ service_find_instance
 
   /* Failed */
   if(si == NULL) {
-    *error = SM_CODE_NO_FREE_ADAPTER;
+    if (*error < SM_CODE_NO_FREE_ADAPTER)
+      *error = SM_CODE_NO_FREE_ADAPTER;
     return NULL;
   }
 
@@ -425,7 +426,9 @@ service_find_instance
   tvhtrace("service", "will start new instance %d", si->si_instance);
   if (service_start(si->si_s, si->si_instance)) {
     tvhtrace("service", "tuning failed");
-    *error = SM_CODE_TUNING_FAILED;
+    si->si_error = SM_CODE_TUNING_FAILED;
+    if (*error < SM_CODE_TUNING_FAILED)
+      *error = SM_CODE_TUNING_FAILED;
     si = NULL;
   }
   return si;
diff --git a/src/subscriptions.c b/src/subscriptions.c
index c4281999..bde6f6cb 100644
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -238,6 +238,7 @@ subscription_reschedule(void)
         s->ths_service = si->si_s;
     }
 
+    error = s->ths_testing_error;
     if (s->ths_channel)
       tvhtrace("subscription", "find service for %s weight %d",
                channel_get_name(s->ths_channel), s->ths_weight);
@@ -319,6 +320,7 @@ subscription_input_direct(void *opauqe, streaming_message_t *sm)
 static void
 subscription_input(void *opauqe, streaming_message_t *sm)
 {
+  int error;
   th_subscription_t *s = opauqe;
 
   if(s->ths_state == SUBSCRIPTION_TESTING_SERVICE) {
@@ -335,7 +337,9 @@ subscription_input(void *opauqe, streaming_message_t *sm)
        sm->sm_code & (TSS_GRACEPERIOD | TSS_ERRORS)) {
       // No, mark our subscription as bad_service
       // the scheduler will take care of things
-      s->ths_testing_error = tss2errcode(sm->sm_code);
+      error = tss2errcode(sm->sm_code);
+      if (error > s->ths_testing_error)
+        s->ths_testing_error = error;
       s->ths_state = SUBSCRIPTION_BAD_SERVICE;
       streaming_msg_free(sm);
       return;