qing
9ccb9cbdca
Migrate gateway from local -i ini file to the unified confs configuration
service, following the same two-layer pattern as Python services (dnfs/db/static):
- Add confs/configs/gateway.ini with all existing settings plus new
[Downstream] section for db/captcha/smtp host:port (previously hardcoded).
- Conf.hpp: add fromString() to parse ini from text (confs response),
env()/env_int() static helpers for environment variables, public default
constructor, and empty-filename guard in file constructor.
- DbC.hpp: add init(host, port) static method and static _host/_port members,
replacing hardcoded "127.0.0.1":8005. Defaults preserved for backward compat.
- main.cpp:
* Rewrite config loading: bootstrap CONFS_HOST/CONFS_PORT from env
(default 127.0.0.1:8010), fetch gateway.ini via pymsg from confs
(retry_on_refused=true), parse with ConfIni::fromString().
* -i flag is now optional; when provided, reads local ini (dev/debug mode).
* Add downstream host/port globals (_DB_HOST/_DB_PORT, _CAPTCHA_HOST/_CAPTCHA_PORT,
_SMTP_HOST/_SMTP_PORT, _CONFS_HOST/_CONFS_PORT), populated from [Downstream].
* Environment variable overrides (highest priority): LISTEN_ADDR/LISTEN_PORT,
DB_HOST/DB_PORT, CAPTCHA_HOST/CAPTCHA_PORT, SMTP_HOST/SMTP_PORT.
* Config integrity validation: required fields (Server.address/port,
Proxy.default, Downstream.db_host/db_port) cause startup failure if missing.
* Initialize DbC::init() and logs().set_endpoint() after config load.
* Replace all hardcoded "127.0.0.1":8005/8008/8009 in captcha/smtp/db calls
with configurable globals.
* Add downstream service info to startup log output.
* Fix: -v/--version flag now actually prints version and exits.
* Bump version to 0.7.0.
- _run.sh: remove -i example.ini default; now starts without args (confs mode),
passes "$@" through for optional -i override.
- Update README with new config loading docs, Downstream config section,
updated directory structure, and v0.7.0 changelog.
58 lines
2.1 KiB
C++
58 lines
2.1 KiB
C++
#pragma once
|
||
#include <us/HttpClient.hpp>
|
||
#include "Msg.hpp"
|
||
#include <boost/json.hpp>
|
||
namespace qing {
|
||
namespace json = boost::json;
|
||
class DbC {
|
||
public:
|
||
/* 本机 db 轻量查询的默认超时（秒）；慢操作由调用方显式放宽。
|
||
* smtp/captcha 等其他下游的超时常量见 main.cpp。 */
|
||
static constexpr double DEFAULT_TIMEOUT = 5.0;
|
||
|
||
/// 初始化 db 服务地址（启动时从配置设置，默认 127.0.0.1:8005）
|
||
static void init(const std::string& host, int port) {
|
||
_host = host;
|
||
_port = port;
|
||
}
|
||
|
||
// 【保留】旧版 HTTP 接口：通过 HttpClient POST 到 dbv2 HTTP /execute 端点。
|
||
// 保留用于兼容性参考，新代码优先使用 call_msg()（pymsg TCP 协议，更可靠）。
|
||
static json::value call_http(json::value& params) {
|
||
|
||
auto client = pmc::net::HttpClient();
|
||
client.set_header("Content-Type: application/json");
|
||
std::string payload = json::serialize(params);
|
||
std::string res = "";
|
||
std::string url = "http://" + _host + ":" + std::to_string(_port) + "/execute";
|
||
client.post_stream_sync(url, payload, [&res](const auto& ret) {
|
||
res += ret;
|
||
});
|
||
return json::parse(res);
|
||
}
|
||
|
||
// 新版 pymsg 接口：通过 MsgClient（TCP 长度前缀帧协议）调用 dbv2。
|
||
// 自动添加 _route = "execute"，返回 dbv2 pymsg 完整 JSON 响应
|
||
// {"success":..., "data":[...]}。
|
||
// 响应格式与 call_http 兼容，调用方可直接替换。
|
||
// db 是强依赖，启用 retry_on_refused：db 未启动时阻塞等待，避免启动顺序问题。
|
||
static json::value call_msg(const json::value& params,
|
||
double timeout = DEFAULT_TIMEOUT) {
|
||
json::value jv_route = params;
|
||
jv_route.as_object()["_route"] = "execute";
|
||
pmc::net::MsgClient client(_host, _port, "gateway");
|
||
std::string resp = client.call(
|
||
json::serialize(jv_route), timeout,
|
||
/*retry_on_refused=*/true);
|
||
return json::parse(resp);
|
||
}
|
||
|
||
static const std::string& host() { return _host; }
|
||
static int port() { return _port; }
|
||
|
||
private:
|
||
static inline std::string _host = "127.0.0.1";
|
||
static inline int _port = 8005;
|
||
};
|
||
}
|