Skip to content
Permalink
Browse files

Merge PR #3196: Merge murmur.grpc.ini and murmur.ini

  • Loading branch information...
mkrautz committed Jul 23, 2017
2 parents 38c525e + c0be50a commit af0b2ecc458960c28e8a8796f3fefc0d3ebc0505
Showing with 14 additions and 226 deletions.
  1. +0 −226 scripts/murmur.grpc.ini
  2. +10 −0 scripts/murmur.ini
  3. +4 −0 src/murmur/main.cpp

This file was deleted.

@@ -79,6 +79,16 @@ ice="tcp -h 127.0.0.1 -p 6502"
;icesecretread=
icesecretwrite=

; If you want to expose Murmur's experimental grPC API, you
; need to specify an address to bind on.
; Note: not all builds of Murmur support gRPC. If gRPC is not
; available, Murmur will warn you in its log output.
;grpc="127.0.0.1:50051"
; Specifying both a certificate and key file below will cause gRPC to use
; secured, TLS connections.
;grpccert=""
;grpckey=""

; How many login attempts do we tolerate from one IP
; inside a given timeframe before we ban the connection?
; Note that this is global (shared between all virtual servers), and that
@@ -557,6 +557,10 @@ int main(int argc, char **argv) {

#ifdef USE_GRPC
GRPCStart();
#else
if (!meta->mp.qsGRPCAddress.isEmpty() || !meta->mp.qsGRPCCert.isEmpty() || !meta->mp.qsGRPCKey.isEmpty()) {
qWarning("This version of Murmur was built without gRPC support. Ignoring 'grpc' option from configuration file.");
}
#endif

meta->getOSInfo();

0 comments on commit af0b2ec

Please sign in to comment.
You can’t perform that action at this time.