Skip to content

Commit

Permalink
version6.3/OCM-30-Remove noreply@openkm.com from crontab
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergio Ochoa authored and Paco Avila committed Oct 24, 2017
1 parent c3cdff4 commit 54fb0dd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
6 changes: 4 additions & 2 deletions src/main/java/com/openkm/core/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.InetAddress;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.TreeMap;

import javax.servlet.ServletContext;

Expand Down Expand Up @@ -90,7 +93,6 @@ public class Config {
public static String EXPORT_METADATA_EXT = ".okm";
public static String ROOT_NODE_UUID = "cafebabe-cafe-babe-cafe-babecafebabe";
public static Version LUCENE_VERSION = Version.LUCENE_31;
public static String DEFAULT_CRONTAB_MAIL = "noreply@openkm.com";

// Preview cache
public static String REPOSITORY_CACHE_HOME;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public static synchronized void start() throws ServletException {

String pptContent = "new com.openkm.util.pendtask.PendingTaskExecutor().run();";
CronTabUtils.createOrUpdate("Process Pending Tasks", "*/5 * * * *", pptContent);

// Datastore garbage collection
if (!Config.REPOSITORY_NATIVE && hasConfiguredDataStore) {
String dgcContent = "new com.openkm.module.jcr.stuff.DataStoreGarbageCollector().run();";
Expand Down
17 changes: 4 additions & 13 deletions src/main/java/com/openkm/util/CronTabUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@

package com.openkm.util;

import com.openkm.core.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.openkm.core.DatabaseException;
import com.openkm.core.MimeTypeConfig;
import com.openkm.dao.CronTabDAO;
import com.openkm.dao.bean.CronTab;
import com.openkm.module.common.CommonAuthModule;
import com.openkm.principal.PrincipalAdapterException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class CronTabUtils {
private static Logger log = LoggerFactory.getLogger(CronTabUtils.class);
Expand All @@ -43,22 +42,14 @@ public static void createOrUpdate(String name, String expression, String content
CronTab ct = CronTabDAO.findByName(name);

if (ct == null) {
String mail = CommonAuthModule.getMail(Config.ADMIN_USER);

ct = new CronTab();
ct.setActive(true);
ct.setExpression(expression);
ct.setFileContent(SecureStore.b64Encode(content.getBytes()));
ct.setFileMime(MimeTypeConfig.MIME_BSH);
ct.setFileName(toFileName(name) + ".bsh");
ct.setName(name);

if (mail != null && !mail.equals("")) {
ct.setMail(mail);
} else {
ct.setMail(Config.DEFAULT_CRONTAB_MAIL);
}

ct.setMail("");
CronTabDAO.create(ct);
} else {
ct.setFileContent(SecureStore.b64Encode(content.getBytes()));
Expand Down

0 comments on commit 54fb0dd

Please sign in to comment.