Merged master into docs_upgrade
This commit is contained in:
commit
7f4bb184a1
9 files changed
+10
-41
No files matched your search
@@ -15,7 +15,7 @@ namespace bts.api.orderman {
|
||||
public OrderRecordImmutable order { get; }
|
||||
|
||||
public override bool Equals(object obj) => (obj is OrderSecurity os) && Equals(os);
|
||||
public bool Equals(OrderSecurity other) => order.Key == other.order.Key && security == other.security;
|
||||
public bool Equals(OrderSecurity other) => order.Equals(other.order) && security == other.security;
|
||||
public override int GetHashCode() => (security, order).GetHashCode();
|
||||
|
||||
public static bool operator == (OrderSecurity left, OrderSecurity right) => left.Equals(right);
|
||||
|
||||
@@ -175,12 +175,12 @@ namespace mbts.spark {
|
||||
clone.Remove(o.order.Key);
|
||||
}
|
||||
}
|
||||
foreach (var o in table.changed) {
|
||||
if (o.order.is_active()) {
|
||||
clone[o.order.Key] = o;
|
||||
foreach (var o in table.changes) {
|
||||
if (o.Old.order.is_active()) {
|
||||
clone.Remove(o.Old.order.Key);
|
||||
}
|
||||
else {
|
||||
clone.Remove(o.order.Key);
|
||||
if (o.New.order.is_active()) {
|
||||
clone.Add(o.New.order.Key, o.New);
|
||||
}
|
||||
}
|
||||
foreach (var o in table.added) {
|
||||
|
||||
@@ -53,7 +53,7 @@ ConfigDownloader::Result ConfigDownloader::get(const string& url, stringstream&
|
||||
curl_easy_setopt(_curl, CURLOPT_WRITEDATA, &out_stream);
|
||||
curl_easy_setopt(_curl, CURLOPT_VERBOSE, 0);
|
||||
curl_easy_setopt(_curl, CURLOPT_FAILONERROR, 1);
|
||||
curl_easy_setopt(_curl, CURLOPT_CONNECTTIMEOUT, 30);
|
||||
curl_easy_setopt(_curl, CURLOPT_CONNECTTIMEOUT, 6);
|
||||
curl_easy_setopt(_curl, CURLOPT_SOCKOPTFUNCTION, no_linger);
|
||||
|
||||
CURLcode res = curl_easy_perform(_curl);
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
#include "lib/logging/logging.h"
|
||||
#include "lib/utils/bts_assert.h"
|
||||
#include "lib/utils/thread_manager.h"
|
||||
#include "lib/utils/Dispatcher.h"
|
||||
|
||||
namespace bts {
|
||||
namespace utils {
|
||||
@@ -21,7 +20,6 @@ void finit_spark_lib()
|
||||
if (poller) {
|
||||
delete poller;
|
||||
}
|
||||
utils::Dispatcher::background().terminate();
|
||||
}
|
||||
|
||||
}}
|
||||
@@ -6,10 +6,6 @@ export PATH="$PATH:/root/.dotnet/tools"
|
||||
if ! [ -x "$(command -v npx)" ]; then
|
||||
npm install -g npx
|
||||
fi
|
||||
# install paket
|
||||
if ! [ -x "$(command -v paket)" ]; then
|
||||
dotnet tool install -g paket
|
||||
fi
|
||||
|
||||
export OUT=${BUILD_DIR:-../../../build}/web
|
||||
MODE=manual
|
||||
|
||||
Reference in new issue
Block a user