Commit dedb8226 authored by iwakeh's avatar iwakeh 🌴 Committed by Karsten Loesing
Browse files

Avoid confusing new users; just print usage instead of a stack trace for miss-configuration.

parent 87d17a42

src/main/java/org/torproject/collector/Main.java

+20 −14
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ package org.torproject.collector; 


import org.torproject.collector.bridgedescs.SanitizedBridgesWriter;

import org.torproject.collector.conf.Configuration;

import org.torproject.collector.conf.ConfigurationException;

import org.torproject.collector.conf.Key;

import org.torproject.collector.cron.CollecTorMain;

import org.torproject.collector.cron.Scheduler;
@@ -57,6 +58,7 @@ public class Main { 
   * See class description {@link Main}.

   */

  public static void main(String[] args) throws Exception {

    try {

      Path confPath = null;

      if (args == null || args.length == 0) {

        confPath = Paths.get(CONF_FILE);
@@ -73,6 +75,10 @@ public class Main { 
        conf.setWatchableSourceAndLoad(confPath);

      }

      Scheduler.getInstance().scheduleModuleRuns(collecTorMains, conf);

    } catch (ConfigurationException ce) {

      printUsage(ce.getMessage());

      return;

    }

  }



  private static void printUsage(String msg) {