ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-02 03:06:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2018-11-13 16:02:31 -08:00
commit 03e35b25b8
4 changed files with 485 additions and 918 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1382
controller/PostgreSQL.cpp
View File

File diff suppressed because it is too large Load Diff

11
controller/PostgreSQL.hpp
View File

@ -23,12 +23,16 @@
#include "DB.hpp" #include "DB.hpp"
#include <pqxx/pqxx>
extern "C" { extern "C" {
typedef struct pg_conn PGconn; typedef struct pg_conn PGconn;
} }
namespace ZeroTier namespace ZeroTier
{ {
class _MemberNotificationReceiver;
class _NetworkNotificationReceiver;
/** /**
* A controller database driver that talks to PostgreSQL * A controller database driver that talks to PostgreSQL
@ -56,8 +60,8 @@ protected:
}; };
private: private:
void initializeNetworks(PGconn *conn); void initializeNetworks(pqxx::connection &conn);
void initializeMembers(PGconn *conn); void initializeMembers(pqxx::connection &conn);
void heartbeat(); void heartbeat();
void membersDbWatcher(); void membersDbWatcher();
void networksDbWatcher(); void networksDbWatcher();
@ -81,6 +85,9 @@ private:
mutable std::mutex _readyLock; mutable std::mutex _readyLock;
std::atomic<int> _ready, _connected, _run; std::atomic<int> _ready, _connected, _run;
mutable volatile bool _waitNoticePrinted; mutable volatile bool _waitNoticePrinted;
friend class _MemberNotificationReceiver;
friend class _NetworkNotificationReceiver;
}; };
} }

2
docker/Dockerfile
View File

@ -4,7 +4,7 @@ MAINTAINER Adam Ierymekno <adam.ierymenko@zerotier.com>, Grant Limberg <grant.li
RUN yum update -y RUN yum update -y
RUN yum install -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm RUN yum install -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm
RUN yum install -y postgresql10 RUN yum install -y postgresql10 libpqxx-devel
RUN yum -y install epel-release && yum -y update && yum clean all RUN yum -y install epel-release && yum -y update && yum clean all
RUN yum -y install clang jemalloc jemalloc-devel RUN yum -y install clang jemalloc jemalloc-devel

2
make-linux.mk
View File

@ -319,7 +319,7 @@ official: FORCE
make -j4 ZT_OFFICIAL=1 all make -j4 ZT_OFFICIAL=1 all
central-controller: FORCE central-controller: FORCE
make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq" CXXFLAGS="-I/usr/pgsql-10/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpqxx -lpq" CXXFLAGS="-I/usr/pgsql-10/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one
central-controller-docker: central-controller central-controller-docker: central-controller
docker build -t gcr.io/zerotier-central/ztcentral-controller:${TIMESTAMP} -f docker/Dockerfile . docker build -t gcr.io/zerotier-central/ztcentral-controller:${TIMESTAMP} -f docker/Dockerfile .