docker container works with SSL + fix compiler warnings in statsd third_party module
This commit is contained in:
		@@ -1 +1 @@
 | 
			
		||||
1.4.0
 | 
			
		||||
1.4.2
 | 
			
		||||
 
 | 
			
		||||
@@ -28,10 +28,11 @@ ENV DEBIAN_FRONTEND noninteractive
 | 
			
		||||
RUN apt-get update 
 | 
			
		||||
# Runtime 
 | 
			
		||||
RUN apt-get install -y libssl1.1 
 | 
			
		||||
RUN apt-get install -y ca-certificates
 | 
			
		||||
RUN ["update-ca-certificates"]
 | 
			
		||||
 | 
			
		||||
# Debugging
 | 
			
		||||
RUN apt-get install -y strace
 | 
			
		||||
RUN apt-get install -y gdb
 | 
			
		||||
RUN apt-get install -y procps
 | 
			
		||||
RUN apt-get install -y htop
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								makefile
									
									
									
									
									
								
							@@ -6,7 +6,7 @@ all: brew
 | 
			
		||||
install: brew
 | 
			
		||||
 | 
			
		||||
brew:
 | 
			
		||||
	mkdir -p build && (cd build ; cmake .. ; make -j install)
 | 
			
		||||
	mkdir -p build && (cd build ; cmake -DUSE_TLS=1 .. ; make -j install)
 | 
			
		||||
 | 
			
		||||
.PHONY: docker
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -111,6 +111,7 @@ def runCMake(sanitizer, buildDir):
 | 
			
		||||
    {sanitizerFlag} \
 | 
			
		||||
    -B{buildDir} \
 | 
			
		||||
    -DCMAKE_BUILD_TYPE=Debug \
 | 
			
		||||
    -DUSE_TLS=1 \
 | 
			
		||||
    -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 | 
			
		||||
'''
 | 
			
		||||
    cmakeCmd = fmt.format(**locals())
 | 
			
		||||
 
 | 
			
		||||
@@ -49,7 +49,7 @@ StatsdClient::StatsdClient(const string& host,
 | 
			
		||||
    d = new _StatsdClientData;
 | 
			
		||||
    d->sock = -1;
 | 
			
		||||
    config(host, port, ns);
 | 
			
		||||
    srandom(time(NULL));
 | 
			
		||||
    srandom((unsigned) time(NULL));
 | 
			
		||||
 | 
			
		||||
    if (batching_) {
 | 
			
		||||
        pthread_mutex_init(&batching_mutex_lock_, nullptr);
 | 
			
		||||
@@ -227,7 +227,7 @@ int StatsdClient::send_to_daemon(const string &message) {
 | 
			
		||||
    {
 | 
			
		||||
        return ret;
 | 
			
		||||
    }
 | 
			
		||||
    ret = sendto(d->sock, message.data(), message.size(), 0, (struct sockaddr *) &d->server, sizeof(d->server));
 | 
			
		||||
    ret = (int) sendto(d->sock, message.data(), message.size(), 0, (struct sockaddr *) &d->server, sizeof(d->server));
 | 
			
		||||
    if ( ret == -1) {
 | 
			
		||||
        snprintf(d->errmsg, sizeof(d->errmsg),
 | 
			
		||||
                 "sendto server fail, host=%s:%d, err=%m", d->host.c_str(), d->port);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user