SPARK-1901 Fix race with server startup in c# api client

This commit is contained in:
Eric Harding committed 2018-12-05 13:36:20 -05:00
1 parent 97925a82d4
commit 67d0a0351a
2 files changed
+29 -11

No files matched your search

@@ -59,20 +59,38 @@ namespace bts.api.core {
public override IObservable<RawUpdate<TOut>> subscribe<TParse,TOut>(int method_id, string method, string qualifier, MessageParser<TParse> parser, Func<TParse,TOut> converter) {
var result = Observable.Create<RawUpdate<TOut>>(async observer => {
var request = new StreamAccessRequest() { Qualifier = qualifier };
var response = await send<StreamAccessRequest, StreamAccessResponse>(method_id, request);
if (!response.success) {
observer.OnError(new ApiException(response.error_message));
return Disposable.Empty;
while (true) {
var response = await check_stream_access(method_id, qualifier);
if (response.success) {
if (response.value.Authorized) {
// success. Break loop and subscribe
break;
}
else {
// Not authorized. return empty stream
observer.OnCompleted();
return Disposable.Empty;
}
}
else {
// Wait for stream to fire once before trying again
var tcs = new TaskCompletionSource<bool>();
ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => {
tcs.SetResult(true);
};
await tcs.Task;
}
}
else if (!response.value.Authorized) {
observer.OnError(new UnauthorizedAccessException());
return Disposable.Empty;
}
return SubscribeNative(method, qualifier, parser, converter, observer);
// Authorized. Stream events
return SubscribeNative(method, qualifier, parser, converter, observer);
});
return result;
}
private Task<Result<StreamAccessResponse>> check_stream_access(int method_id, string qualifier) {
var request = new StreamAccessRequest() { Qualifier = qualifier };
return send<StreamAccessRequest, StreamAccessResponse>(method_id, request);
}
private unsafe IDisposable SubscribeNative<TParse, TOut>(string method, string qualifier, MessageParser<TParse> parser, Func<TParse, TOut> converter, IObserver<RawUpdate<TOut>> observer) where TParse : IMessage<TParse> {
bool first_update = true;
@@ -93,7 +93,7 @@ namespace bts {
var ctx = new ServiceContext();
var s = ctx.locate<api.admin.AdminService>();
var d = s.subscribei_admin_data("quack").Subscribe(Console.WriteLine);
var d = s.subscribei_admin_data().Subscribe(Console.WriteLine);
//var resp = s.get_admin_data(new VoidMessage());
//Console.WriteLine("{0}", resp);