Skip to content
Snippets Groups Projects
Commit 656cdcc2 authored by Mikhail Karnevskiy's avatar Mikhail Karnevskiy
Browse files

Make service request a unique pointer.

parent 22950d21
No related branches found
No related tags found
No related merge requests found
...@@ -60,6 +60,7 @@ namespace asapo ...@@ -60,6 +60,7 @@ namespace asapo
class ServiceRequest class ServiceRequest
{ {
public: public:
std::string UrlEscape(std::string url);
ServiceRequest(std::string server_uri, SourceCredentials source); ServiceRequest(std::string server_uri, SourceCredentials source);
std::string BrokerRequestWithTimeout(RequestInfo request, Error *err, uint64_t timeout_ms, std::atomic<bool> &interrupt_flag); std::string BrokerRequestWithTimeout(RequestInfo request, Error *err, uint64_t timeout_ms, std::atomic<bool> &interrupt_flag);
......
...@@ -143,6 +143,11 @@ namespace asapo ...@@ -143,6 +143,11 @@ namespace asapo
return err; return err;
} }
std::string ServiceRequest::UrlEscape(std::string url)
{
return httpclient__->UrlEscape(url);
}
ServiceRequest::ServiceRequest(std::string server_uri, ServiceRequest::ServiceRequest(std::string server_uri,
SourceCredentials source) : httpclient__{DefaultHttpClient()}, SourceCredentials source) : httpclient__{DefaultHttpClient()},
endpoint_{std::move(server_uri)}, endpoint_{std::move(server_uri)},
......
...@@ -291,7 +291,7 @@ Error ProducerImpl::SetCredentials(SourceCredentials source_cred) { ...@@ -291,7 +291,7 @@ Error ProducerImpl::SetCredentials(SourceCredentials source_cred) {
if (!err) { if (!err) {
last_creds_.reset(new SourceCredentials{source_cred}); last_creds_.reset(new SourceCredentials{source_cred});
} }
service_request_ = new ServiceRequest(endpoint_, source_cred); service_request_ = std::unique_ptr<ServiceRequest> {new ServiceRequest(endpoint_, source_cred)};
return err; return err;
} }
......
...@@ -82,7 +82,11 @@ class ProducerImpl : public Producer { ...@@ -82,7 +82,11 @@ class ProducerImpl : public Producer {
void SetRequestsQueueLimits(uint64_t size, uint64_t volume) override; void SetRequestsQueueLimits(uint64_t size, uint64_t volume) override;
std::string GetStreamMeta(const std::string& stream, uint64_t timeout_ms, Error* err) const override; std::string GetStreamMeta(const std::string& stream, uint64_t timeout_ms, Error* err) const override;
std::string GetBeamtimeMeta(uint64_t timeout_ms, Error* err) const override; std::string GetBeamtimeMeta(uint64_t timeout_ms, Error* err) const override;
<<<<<<< HEAD
=======
>>>>>>> d74104e8 (Make service request a unique pointer.)
private: private:
Error SendMeta(const std::string& metadata, Error SendMeta(const std::string& metadata,
MetaIngestMode mode, MetaIngestMode mode,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment