Refactor

httpret/src/channelarchiver.rs

@@ -280,7 +280,7 @@ impl BlockRefStream {
             //name: "ARIDI-PCT:CURRENT".into(),
         };
         use archapp_wrap::archapp::archeng;
-        let s = archeng::blockrefstream::blockref_stream(channel, range, conf.clone());
+        let s = archeng::blockrefstream::blockref_stream(channel, range, true, conf.database.clone());
         let s = s.map(|item| match item {
             Ok(item) => {
                 use archeng::blockrefstream::BlockrefItem::*;
@@ -346,7 +346,7 @@ impl BlockStream {
             name: channel_name,
         };
         use archapp_wrap::archapp::archeng;
-        let s = archeng::blockrefstream::blockref_stream(channel, range.clone(), conf.clone());
+        let s = archeng::blockrefstream::blockref_stream(channel, range.clone(), true, conf.database.clone());
         let s = Box::pin(s);
         let s = archeng::blockstream::BlockStream::new(s, range.clone(), read_queue);
         let s = s.map(|item| match item {

httpret/src/httpret.rs

@@ -1,7 +1,14 @@
+pub mod api1;
+pub mod channelarchiver;
+pub mod gather;
+pub mod proxy;
+pub mod pulsemap;
+pub mod search;
+
 use crate::gather::gather_get_json;
 use crate::pulsemap::UpdateTask;
 use bytes::Bytes;
-use disk::binned::query::{BinnedQuery, PreBinnedQuery};
+use disk::binned::query::PreBinnedQuery;
 use disk::events::{PlainEventsBinaryQuery, PlainEventsJsonQuery};
 use err::Error;
 use future::Future;
@@ -13,11 +20,10 @@ use hyper::service::{make_service_fn, service_fn};
 use hyper::{server::Server, Body, Request, Response};
 use net::SocketAddr;
 use netpod::log::*;
+use netpod::query::BinnedQuery;
 use netpod::timeunits::SEC;
-use netpod::{
-    channel_from_pairs, get_url_query_pairs, AggKind, ChannelConfigQuery, FromUrl, NodeConfigCached, APP_JSON,
-    APP_JSON_LINES, APP_OCTET,
-};
+use netpod::{channel_from_pairs, get_url_query_pairs, AggKind, ChannelConfigQuery, FromUrl, NodeConfigCached};
+use netpod::{APP_JSON, APP_JSON_LINES, APP_OCTET};
 use nodenet::conn::events_service;
 use panic::{AssertUnwindSafe, UnwindSafe};
 use pin::Pin;
@@ -28,13 +34,6 @@ use tracing::field::Empty;
 use tracing::Instrument;
 use url::Url;
 
-pub mod api1;
-pub mod channelarchiver;
-pub mod gather;
-pub mod proxy;
-pub mod pulsemap;
-pub mod search;
-
 fn proxy_mark() -> &'static str {
     "7c5e408a"
 }
@@ -53,9 +52,11 @@ pub async fn host(node_config: NodeConfigCached) -> Result<(), Error> {
             // TODO send to logstash
             debug!("new connection from {:?}", conn.remote_addr());
             let node_config = node_config.clone();
+            let addr = conn.remote_addr();
             async move {
                 Ok::<_, Error>(service_fn({
                     move |req| {
+                        info!("REQUEST  {:?}  {:?}", addr, req.uri());
                         let f = http_service(req, node_config.clone());
                         Cont { f: Box::pin(f) }
                     }

httpret/src/proxy.rs

@@ -3,7 +3,6 @@ pub mod api4;
 use crate::api1::{channel_search_configs_v1, channel_search_list_v1, gather_json_2_v1, proxy_distribute_v1};
 use crate::gather::{gather_get_json_generic, SubRes};
 use crate::{api_1_docs, api_4_docs, response, Cont};
-use disk::binned::query::BinnedQuery;
 use disk::events::PlainEventsJsonQuery;
 use err::Error;
 use futures_core::Stream;
@@ -14,6 +13,7 @@ use hyper::{Body, Request, Response, Server};
 use hyper_tls::HttpsConnector;
 use itertools::Itertools;
 use netpod::log::*;
+use netpod::query::BinnedQuery;
 use netpod::{
     AppendToUrl, ChannelConfigQuery, ChannelSearchQuery, ChannelSearchResult, ChannelSearchSingleResult, FromUrl,
     HasBackend, HasTimeout, ProxyConfig, APP_JSON,