Report-870

[niyolynate]

Still haven't sent my changes, i get errors..
i get errors in git while pushing them. will keep trying though. i added restart @LINE45 - 49 and added time for tasks at line 90-99.

package org.openmrs.module.reporting;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.openmrs.api.context.Context;
import org.openmrs.module.BaseModuleActivator;
import org.openmrs.module.DaemonToken;
import org.openmrs.module.DaemonTokenAware;
import org.openmrs.module.reporting.common.MessageUtil;
import org.openmrs.module.reporting.report.task.ReportingTimerTask;
import org.openmrs.module.reporting.report.task.RunQueuedReportsTask;

/**

• This class contains the logic that is run every time this module is either started or shutdown
  */
  public class ReportingModuleActivator extends BaseModuleActivator implements DaemonTokenAware {

  private Log log = LogFactory.getLog(this.getClass());

  @OverRide
  public void contextRefreshed() {
  // This will ensure that the MessageUtil picks back up the current active message source
  MessageUtil.setMessageSource(null);
  }

  @OverRide
  public void started() {
  ReportingTimerTask.setEnabled(true);
  log.info("Reporting Module Started...");
  }

  @OverRide
  public void restart()
  restartAllScheduledTasks();
  restartCurrentRunningReportRequest;
  }

  @OverRide
  public void willStop() {
  cancelAllScheduledTasks();
  cancelCurrentlyRunningReportRequests();
  }

  @OverRide
  public void stopped() {
  log.info("Reporting Module Stopped...");
  }

  @OverRide
  public void setDaemonToken(DaemonToken token) {
  ReportingTimerTask.setDaemonToken(token);
  }

  /**

  • Cancels all scheduled tasks
    /
    private void cancelAllScheduledTasks() {
    for (ReportingTimerTask task : Context.getRegisteredComponents(ReportingTimerTask.class)) {
    try {
    task.cancel();
    }
    catch (Exception e) {
    log.warn("An exception occurred while trying to stop reporting task " + task.getTaskClass().getSimpleName(), e);
    }
    }
    }
    /*

  • Cancels all currently running report requests
    */
    private void cancelCurrentlyRunningReportRequests() {
    for (RunQueuedReportsTask task : RunQueuedReportsTask.getCurrentlyRunningRequests().values()) {
    try {
    task.cancelTask();
    }
    catch (Exception e) {
    log.warn("An exception occurred while trying to stop currently running reports", e);

     	//Time lap between the last task to current updates.
     	public voidsetTask(Integer time) {
     		    oldT = t;
     		    t = time;
     		    log.debug("Time set to {}. innitialDate {}.", t, innitialDate);
     		    if(time.intValue() > 50sec) {
     		      log.info("Time passed in days\hr\min\sec.");
     }
    

    }
    }
    }

[kumuditha-udayanga]

Hello @niyolynate, Before working on any changes make sure to take the latest updates from the upstream's master branch to update your remote.
In order to fix the git issue, I would suggest :

1. In your local project, create a new branch from the master branch, git branch feature-{issue number}.
2. Checkout to the newly created branch git checkout {branch name}
3. Reset that branch to upstream's master branch git reset --hard upstream master. And pull the latest changes by git pull upstream master.
4. Then start working on your changes, or else you can get the changes that you committed in the master branch using cherry-pick. (you must copy the checksum of the commit message from the master branch)
   git cherry-pick {checksum}
5. If there are any changes before pushing the changes, commit the changes and take a pull from upstream and push the changes to your origin (make sure to push the changes using the new branch name, so it creates a new branch in the origin, and make a pull request using that branch).