This commit is contained in:
crusader 2018-06-20 16:00:24 +09:00
parent cf052670cc
commit c1fa8fdb05
3 changed files with 7 additions and 16 deletions

View File

@ -27,13 +27,10 @@ export class DiscoverySubscriber {
public constructor( public constructor(
private loggerService: LoggerService, private loggerService: LoggerService,
) { ) {
this.discoverySubscriberSubject = null; this.discoverySubscriberSubject = new DiscoverySubscriberSubject();
} }
public observable(): Observable<DiscoveryNotify> { public observable(): Observable<DiscoveryNotify> {
if (null === this.discoverySubscriberSubject) {
this.discoverySubscriberSubject = new DiscoverySubscriberSubject();
}
return this.discoverySubscriberSubject.asObservable(); return this.discoverySubscriberSubject.asObservable();
} }

View File

@ -23,13 +23,10 @@ export class NoAuthProbeSubscriber {
public constructor( public constructor(
private loggerService: LoggerService, private loggerService: LoggerService,
) { ) {
this.noAuthProbeSubscriberSubject = null; this.noAuthProbeSubscriberSubject = new NoAuthProbeSubscriberSubject();
} }
public observable(): Observable<NoAuthProbeNotify> { public observable(): Observable<NoAuthProbeNotify> {
if (null === this.noAuthProbeSubscriberSubject) {
this.noAuthProbeSubscriberSubject = new NoAuthProbeSubscriberSubject();
}
return this.noAuthProbeSubscriberSubject.asObservable(); return this.noAuthProbeSubscriberSubject.asObservable();
} }
@ -37,14 +34,14 @@ export class NoAuthProbeSubscriber {
this.noAuthProbeSubscriberSubject.next({ method: method, params: params }); this.noAuthProbeSubscriberSubject.next({ method: method, params: params });
} }
@RPCSubscriber({method: 'NoAuthProbeService.onConnect'}) @RPCSubscriber({ method: 'NoAuthProbeService.onConnect' })
public onConnect(noAuthProbe: NoAuthProbe): void { public onConnect(noAuthProbe: NoAuthProbe): void {
this.loggerService.debug('NoAuthProbeService.onConnect noAuthProbe:', noAuthProbe); this.loggerService.debug('NoAuthProbeService.onConnect noAuthProbe:', noAuthProbe);
this.publish('NoAuthProbeService.onConnect', noAuthProbe); this.publish('NoAuthProbeService.onConnect', noAuthProbe);
} }
@RPCSubscriber({method: 'NoAuthProbeService.onDisconnect'}) @RPCSubscriber({ method: 'NoAuthProbeService.onDisconnect' })
public onDisconnect(noAuthProbe: NoAuthProbe): void { public onDisconnect(noAuthProbe: NoAuthProbe): void {
this.loggerService.debug('NoAuthProbeService.onDisconnect noAuthProbe:', noAuthProbe); this.loggerService.debug('NoAuthProbeService.onDisconnect noAuthProbe:', noAuthProbe);

View File

@ -23,13 +23,10 @@ export class ProbeSubscriber {
public constructor( public constructor(
private loggerService: LoggerService, private loggerService: LoggerService,
) { ) {
this.probeSubscriberSubject = null; this.probeSubscriberSubject = new ProbeSubscriberSubject();
} }
public observable(): Observable<ProbeNotify> { public observable(): Observable<ProbeNotify> {
if (null === this.probeSubscriberSubject) {
this.probeSubscriberSubject = new ProbeSubscriberSubject();
}
return this.probeSubscriberSubject.asObservable(); return this.probeSubscriberSubject.asObservable();
} }
@ -37,14 +34,14 @@ export class ProbeSubscriber {
this.probeSubscriberSubject.next({ method: method, params: params }); this.probeSubscriberSubject.next({ method: method, params: params });
} }
@RPCSubscriber({method: 'ProbeService.onConnect'}) @RPCSubscriber({ method: 'ProbeService.onConnect' })
public onConnect(probe: Probe): void { public onConnect(probe: Probe): void {
this.loggerService.debug('ProbeService.onConnect probe:', probe); this.loggerService.debug('ProbeService.onConnect probe:', probe);
this.publish('ProbeService.onConnect', probe); this.publish('ProbeService.onConnect', probe);
} }
@RPCSubscriber({method: 'ProbeService.onDisconnect'}) @RPCSubscriber({ method: 'ProbeService.onDisconnect' })
public onDisconnect(probe: Probe): void { public onDisconnect(probe: Probe): void {
this.loggerService.debug('ProbeService.onDisconnect noAuthProbe:', probe); this.loggerService.debug('ProbeService.onDisconnect noAuthProbe:', probe);