wait a second between stop and start in the restart command. This avoid

[pazpar2-moved-to-github.git] / src / http_command.c

diff --git a/src/http_command.c b/src/http_command.c
index 8ec3264..340e7c0 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -595,23 +595,20 @@ static void cmd_record(struct http_channel *c)
         }
         else
         {
-            void *data2;
             http_channel_observer_t obs =
                 http_add_observer(c, r->client, show_raw_reset);
-            int ret = 
-                client_show_raw_begin(r->client, r->position, syntax, esn, 
-                                      obs /* data */,
-                                      show_raw_record_error,
-                                      (binary ? 
-                                       show_raw_record_ok_binary : 
-                                       show_raw_record_ok),
-                                      &data2,
-                                      (binary ? 1 : 0));
+            int ret = client_show_raw_begin(r->client, r->position,
+                                        syntax, esn, 
+                                        obs /* data */,
+                                        show_raw_record_error,
+                                        (binary ? 
+                                         show_raw_record_ok_binary : 
+                                         show_raw_record_ok),
+                                        (binary ? 1 : 0));
             if (ret == -1)
             {
                 http_remove_observer(obs);
                 error(rs, PAZPAR2_NO_SESSION, 0);
-                return;
             }
         }
     }
@@ -858,7 +855,11 @@ static void cmd_info(struct http_channel *c)
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, "<info>\n");
     wrbuf_puts(c->wrbuf, " <version>\n");
-    wrbuf_puts(c->wrbuf, "<pazpar2>");
+    wrbuf_puts(c->wrbuf, "<pazpar2");
+#ifdef PAZPAR2_VERSION_SHA1
+    wrbuf_printf(c->wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
+#endif
+    wrbuf_puts(c->wrbuf, ">");
     wrbuf_xmlputs(c->wrbuf, VERSION);
     wrbuf_puts(c->wrbuf, "</pazpar2>");