Merge pull request #262 from AdExNetwork/logging-and-fixes

Logging and fixes

Author: Ivo Georgiev

Dockerfile

@@ -38,8 +38,8 @@ RUN apt update && apt-get install -y libssl-dev
 
 COPY --from=builder /usr/local/bin/validator_worker .
 
-ENTRYPOINT validator_worker -a ${ADAPTER:-ethereum} \
+CMD validator_worker -a ${ADAPTER:-ethereum} \
             ${KEYSTORE_FILE:+-k $KEYSTORE_FILE} \
             ${DUMMY_IDENTITY:+-i $DUMMY_IDENTITY} \
             ${SINGLE_TICK:+-t} \
-            ${SENTRY_URL:+-u $SENTRY_URL} ${CONFIG}
+            ${SENTRY_URL:+-u $SENTRY_URL} ${CONFIG}

sentry/src/event_aggregator.rs

@@ -111,7 +111,7 @@ impl EventAggregator {
                                 break;
                             }
 
-                            delay_for(Duration::from_secs(aggr_throttle as u64)).await;
+                            delay_for(Duration::from_millis(aggr_throttle as u64)).await;
                             store(&dbpool, &channel_id, &logger, recorder.clone()).await;
                         }
                     });

validator_worker/src/main.rs

@@ -15,7 +15,7 @@ use primitives::adapter::{Adapter, DummyAdapterOptions, KeystoreOptions};
 use primitives::config::{configuration, Config};
 use primitives::util::tests::prep_db::{AUTH, IDS};
 use primitives::{Channel, SpecValidator, ValidatorId};
-use slog::{error, Logger};
+use slog::{error, info, Logger};
 use validator_worker::error::ValidatorWorker as ValidatorWorkerError;
 use validator_worker::{all_channels, follower, leader, SentryApi};
 
@@ -149,7 +149,7 @@ fn run<A: Adapter + 'static>(
 async fn infinite<A: Adapter + 'static>(args: Args<A>, logger: &Logger) {
     loop {
         let arg = args.clone();
-        let delay_future = delay_for(Duration::from_secs(arg.config.wait_time as u64));
+        let delay_future = delay_for(Duration::from_millis(arg.config.wait_time as u64));
         let _result = join(iterate_channels(arg, logger), delay_future).await;
     }
 }
@@ -174,6 +174,8 @@ async fn iterate_channels<A: Adapter + 'static>(args: Args<A>, logger: &Logger)
     )
     .await;
 
+    info!(logger, "processed {} channels", channels_size);
+
     if let Err(e) = tick {
         error!(logger, "An occurred while processing channels {}", &e; "main" => "iterate_channels");
     }
@@ -192,7 +194,7 @@ async fn validator_tick<A: Adapter + 'static>(
     let whoami = adapter.whoami().clone();
     // Cloning the `Logger` is cheap, see documentation for more info
     let sentry = SentryApi::init(adapter, &channel, &config, logger.clone())?;
-    let duration = Duration::from_secs(config.validator_tick_timeout as u64);
+    let duration = Duration::from_millis(config.validator_tick_timeout as u64);
 
     match channel.spec.validators.find(&whoami) {
         SpecValidator::Leader(_) => {

validator_worker/src/sentry_interface.rs

@@ -34,7 +34,7 @@ impl<T: Adapter + 'static> SentryApi<T> {
         logger: Logger,
     ) -> Result<Self, ValidatorWorker> {
         let client = Client::builder()
-            .timeout(Duration::from_secs(config.fetch_timeout.into()))
+            .timeout(Duration::from_millis(config.fetch_timeout.into()))
             .build()
             .map_err(|e| ValidatorWorker::Failed(format!("building Client error: {}", e)))?;