diff options
| author | Dan Engelbrecht <[email protected]> | 2023-08-11 16:39:45 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-11 16:39:45 +0200 |
| commit | bf4738df5cad0eaa61f4e24b8db7611e378f9f80 (patch) | |
| tree | 6f0ada74fc5c49b71b64f7731c0681ef544bea65 /src/zenserver | |
| parent | 0.2.16-pre0 (diff) | |
| download | zen-bf4738df5cad0eaa61f4e24b8db7611e378f9f80.tar.xz zen-bf4738df5cad0eaa61f4e24b8db7611e378f9f80.zip | |
update vcpkg dependencies (#356)
* bump vcpkg version
* fmt lib 10 fixes
* xmake dependencies (with linux workarounds)
* changelog
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/cache/httpstructuredcache.cpp | 3 | ||||
| -rw-r--r-- | src/zenserver/projectstore/projectstore.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver/xmake.lua | 5 | ||||
| -rw-r--r-- | src/zenserver/zenserver.cpp | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/cache/httpstructuredcache.cpp index 03bbde10e..7c4097d4f 100644 --- a/src/zenserver/cache/httpstructuredcache.cpp +++ b/src/zenserver/cache/httpstructuredcache.cpp @@ -541,7 +541,8 @@ HttpStructuredCacheService::HandleDetailsRequest(HttpServerRequest& Request) Cbo.AddHash("rawhash", ValueIt.second.RawHash); } Cbo.AddString("contenttype", ToString(ValueIt.second.ContentType)); - Cbo.AddInteger("age", NowSeconds.count() - LastAccessedSeconds.count()); + Cbo.AddInteger("age", + gsl::narrow<uint64_t>(NowSeconds.count() - LastAccessedSeconds.count())); if (ValueIt.second.Attachments.size() > 0) { if (AttachmentDetails) diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp index 4865f048b..3a91d7f0c 100644 --- a/src/zenserver/projectstore/projectstore.cpp +++ b/src/zenserver/projectstore/projectstore.cpp @@ -317,8 +317,8 @@ struct ProjectStore::OplogStorage : public RefCounted ZEN_INFO("Oplog replay completed in {} - Max LSN# {}, Next offset: {}", NiceTimeSpanMs(Timer.GetElapsedTimeMs()), - m_MaxLsn, - m_NextOpsOffset); + m_MaxLsn.load(), + m_NextOpsOffset.load()); } void ReplayLog(const std::span<OplogEntryAddress> Entries, std::function<void(CbObject)>&& Handler) diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua index ed589ae93..a2d02baae 100644 --- a/src/zenserver/xmake.lua +++ b/src/zenserver/xmake.lua @@ -44,10 +44,13 @@ target("zenserver") "vcpkg::lua", "vcpkg::mimalloc", "vcpkg::rocksdb", - "vcpkg::sentry-native", "vcpkg::sol2" ) + if has_config("zensentry") then + add_packages("vcpkg::sentry-native") + end + if is_plat("linux") then -- As sentry_native uses symbols from breakpad_client, the latter must -- be specified after the former with GCC-like toolchains. xmake however diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index 6e636611d..d4a82231d 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -1173,7 +1173,7 @@ ZenEntryPoint::Run() ZEN_INFO( "Looks like there is already a process listening to this port {} (pid: {}), attaching owner pid {} to running instance", ServerOptions.BasePort, - Entry->Pid, + Entry->Pid.load(), ServerOptions.OwnerPid); Entry->AddSponsorProcess(ServerOptions.OwnerPid); @@ -1182,7 +1182,9 @@ ZenEntryPoint::Run() } else { - ZEN_WARN("Exiting since there is already a process listening to port {} (pid: {})", ServerOptions.BasePort, Entry->Pid); + ZEN_WARN("Exiting since there is already a process listening to port {} (pid: {})", + ServerOptions.BasePort, + Entry->Pid.load()); std::exit(1); } } |