[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner Scanner.java,1.25,1.26

[<de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner
In directory sc8-pr-cvs1:/tmp/cvs-serv9328/modules/scanner/src/com/babeldoc/scanner

Modified Files:
	Scanner.java 
Log Message:
Fixing some minor problems when shutting down scanner tool


Index: Scanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/Scanner.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Scanner.java	7 Aug 2003 08:46:34 -0000	1.25
--- Scanner.java	13 Aug 2003 11:32:30 -0000	1.26
***************
*** 96,100 ****
    private ScannerFactory factory;
    private ScannerWorkerScheduler scheduler;
- 
    public static final String SCANNER_FEEDER = "scanner";
    public String scannerConfig;
--- 96,99 ----
***************
*** 147,152 ****
     *
     */
!   public void finishUp() {
!     this.stop();
    }
  
--- 146,151 ----
     *
     */
!   public void finishUp() {    
!   	this.stop();     
    }
  
***************
*** 217,246 ****
     */
    public void start() throws ScannerException {
-     factory = ScannerFactory.getInstance(scannerConfig);
-     log.logInfo("Starting feeder...");
- 
- //    feeder = new AsynchronousFeeder(queue);
-     try {
-       feeder = FeederFactory.getInstance().getFeeder(SCANNER_FEEDER);
-     } catch (GeneralException e) {
-       e.printStackTrace();  //To change body of catch statement use Options | File Templates.
-     }
-     //handleRemoteServer(-1);
-     log.logInfo("Initializing workers:");
- 
-     ScannerWorker[] sw = factory.getWorkers();
-     scheduler = new ScannerWorkerScheduler();
  
!     log.logInfo("Starting workers...");
! 
!     for (int i = 0; i < sw.length; i++) {
!       try {
!         sw[i].setFeeder(feeder);
!         scheduler.startWorker(sw[i]);
!       } catch (Exception e) {
!         log.logError("Error starting scanner worker " + sw[i].getName(), e);
!         stop();
!       }
!     }
    }
  
--- 216,247 ----
     */
    public void start() throws ScannerException {
  
! 		log.logInfo("Loading workers...");
! 		factory = ScannerFactory.getInstance(scannerConfig);
! 		ScannerWorker[] sw = factory.getWorkers();
! 		
! 		if (sw.length == 0) {
! 			log.logWarn("There are no workers configured!");
! 		} else {		
! 			log.logInfo("Starting feeder...");
!     	try {
!       	feeder = FeederFactory.getInstance().getFeeder(SCANNER_FEEDER);
!     	} catch (GeneralException e) {
!       	log.logError("Error starting feeder!", e);  
!     	}
! 		
! 			log.logInfo("Starting workers...");
!     	scheduler = new ScannerWorkerScheduler();			
! 		
! 			for (int i = 0; i < sw.length; i++) {
! 			  try {
! 					sw[i].setFeeder(feeder);
! 					scheduler.startWorker(sw[i]);
! 			  } catch (Exception e) {
! 					log.logError("Error starting scanner worker " + sw[i].getName(), e);
! 					stop();
! 			  }
! 			}
! 		}
    }
  
***************
*** 263,276 ****
    	// if there is no scheduler, then we haven't started anything that needs to be
    	// stopped...
!   	if (this.scheduler == null) {
!   		return;
    	}
  
!     log.logInfo("Shutting down...");
!     log.logInfo("Stopping workers...");
!     this.scheduler.stopAll();
! 
!     this.feeder.terminate();
!     log.logInfo("Stopping feeder");
    }
  
--- 264,277 ----
    	// if there is no scheduler, then we haven't started anything that needs to be
    	// stopped...
! 		log.logInfo("Shutting down...");
!   	if (this.scheduler != null) {
! 			log.logInfo("Stopping workers...");
! 			this.scheduler.stopAll();
    	}
  
!     if (feeder != null) {
! 			log.logInfo("Stopping feeder");
! 			this.feeder.terminate();			
!     }
    }