mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-17 20:50:44 +00:00
turned down some loggly messages, added utility method to value utils
This commit is contained in:
@ -83,7 +83,7 @@ public class RunRecordScriptAutomationHandler extends RecordAutomationHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
QRecord scriptRevision = queryOutput.getRecords().get(0);
|
QRecord scriptRevision = queryOutput.getRecords().get(0);
|
||||||
LOG.info("Running script against records", logPair("scriptRevisionId", scriptRevision.getValue("id")), logPair("scriptId", scriptRevision.getValue("scriptIdd")));
|
LOG.debug("Running script against records", logPair("scriptRevisionId", scriptRevision.getValue("id")), logPair("scriptId", scriptRevision.getValue("scriptIdd")));
|
||||||
|
|
||||||
RunAdHocRecordScriptInput input = new RunAdHocRecordScriptInput();
|
RunAdHocRecordScriptInput input = new RunAdHocRecordScriptInput();
|
||||||
input.setCodeReference(new AdHocScriptCodeReference().withScriptRevisionRecord(scriptRevision));
|
input.setCodeReference(new AdHocScriptCodeReference().withScriptRevisionRecord(scriptRevision));
|
||||||
|
@ -356,12 +356,12 @@ public abstract class AbstractTableSyncTransformStep extends AbstractTransformSt
|
|||||||
{
|
{
|
||||||
if(existingRecord != null)
|
if(existingRecord != null)
|
||||||
{
|
{
|
||||||
LOG.info("Skipping storing existing record because this sync process is set to not perform updates");
|
LOG.debug("Skipping storing existing record because this sync process is set to not perform updates");
|
||||||
willNotInsert.incrementCountAndAddPrimaryKey(sourcePrimaryKey);
|
willNotInsert.incrementCountAndAddPrimaryKey(sourcePrimaryKey);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOG.info("Skipping storing new record because this sync process is set to not perform inserts");
|
LOG.debug("Skipping storing new record because this sync process is set to not perform inserts");
|
||||||
willNotUpdate.incrementCountAndAddPrimaryKey(sourcePrimaryKey);
|
willNotUpdate.incrementCountAndAddPrimaryKey(sourcePrimaryKey);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
@ -475,4 +475,31 @@ public class StringUtils
|
|||||||
return (s);
|
return (s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/***************************************************************************
|
||||||
|
**
|
||||||
|
***************************************************************************/
|
||||||
|
public static String appendIncrementingSuffix(String input)
|
||||||
|
{
|
||||||
|
////////////////////////////////
|
||||||
|
// remove any existing suffix //
|
||||||
|
////////////////////////////////
|
||||||
|
String base = input.replaceAll(" \\(\\d+\\)$", "");
|
||||||
|
if(input.matches(".* \\(\\d+\\)$"))
|
||||||
|
{
|
||||||
|
//////////////////////////
|
||||||
|
// increment if matches //
|
||||||
|
//////////////////////////
|
||||||
|
int current = Integer.parseInt(input.replaceAll(".* \\((\\d+)\\)$", "$1"));
|
||||||
|
return base + " (" + (current + 1) + ")";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
////////////////////////////////////
|
||||||
|
// no match so put a 1 at the end //
|
||||||
|
////////////////////////////////////
|
||||||
|
return base + " (1)";
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,7 @@ public class ValueUtils
|
|||||||
|
|
||||||
private static final DateTimeFormatter dateTimeFormatter_yyyyMMddWithDashes = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
private static final DateTimeFormatter dateTimeFormatter_yyyyMMddWithDashes = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||||
private static final DateTimeFormatter dateTimeFormatter_MdyyyyWithSlashes = DateTimeFormatter.ofPattern("M/d/yyyy");
|
private static final DateTimeFormatter dateTimeFormatter_MdyyyyWithSlashes = DateTimeFormatter.ofPattern("M/d/yyyy");
|
||||||
|
private static final DateTimeFormatter dateTimeFormatter_MdyyWithSlashes = DateTimeFormatter.ofPattern("M/d/yyyy");
|
||||||
private static final DateTimeFormatter dateTimeFormatter_yyyyMMdd = DateTimeFormatter.ofPattern("yyyyMMdd");
|
private static final DateTimeFormatter dateTimeFormatter_yyyyMMdd = DateTimeFormatter.ofPattern("yyyyMMdd");
|
||||||
|
|
||||||
|
|
||||||
@ -450,7 +451,7 @@ public class ValueUtils
|
|||||||
private static LocalDate tryLocalDateParsers(String s)
|
private static LocalDate tryLocalDateParsers(String s)
|
||||||
{
|
{
|
||||||
DateTimeParseException lastException = null;
|
DateTimeParseException lastException = null;
|
||||||
for(DateTimeFormatter dateTimeFormatter : List.of(dateTimeFormatter_yyyyMMddWithDashes, dateTimeFormatter_MdyyyyWithSlashes, dateTimeFormatter_yyyyMMdd))
|
for(DateTimeFormatter dateTimeFormatter : List.of(dateTimeFormatter_yyyyMMddWithDashes, dateTimeFormatter_MdyyyyWithSlashes, dateTimeFormatter_yyyyMMdd, dateTimeFormatter_MdyyWithSlashes))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -18,22 +18,16 @@
|
|||||||
</File>
|
</File>
|
||||||
</Appenders>
|
</Appenders>
|
||||||
<Loggers>
|
<Loggers>
|
||||||
<Logger name="org.apache.log4j.xml" additivity="false">
|
<Logger name="org.apache.log4j.xml" additivity="false" />
|
||||||
</Logger>
|
<Logger name="org.mongodb.driver" level="WARN" />
|
||||||
<Logger name="org.mongodb.driver" level="WARN">
|
<Logger name="org.eclipse.jetty" level="INFO" />
|
||||||
</Logger>
|
<Logger name="io.javalin" level="INFO" />
|
||||||
<Logger name="org.eclipse.jetty" level="INFO">
|
|
||||||
</Logger>
|
|
||||||
<Logger name="io.javalin" level="INFO">
|
|
||||||
</Logger>
|
|
||||||
<!-- c3p0 -->
|
<!-- c3p0 -->
|
||||||
<Logger name="com.mchange.v2" level="INFO">
|
<Logger name="com.mchange.v2" level="INFO" />
|
||||||
</Logger>
|
<Logger name="org.quartz" level="INFO" />
|
||||||
<Logger name="org.quartz" level="INFO">
|
<Logger name="liquibase" level="INFO" />
|
||||||
</Logger>
|
<Logger name="com.amazonaws" level="INFO" />
|
||||||
<Logger name="liquibase" level="INFO">
|
<Root level="INFO">
|
||||||
</Logger>
|
|
||||||
<Root level="all">
|
|
||||||
<AppenderRef ref="SystemOutAppender"/>
|
<AppenderRef ref="SystemOutAppender"/>
|
||||||
<AppenderRef ref="SyslogAppender"/>
|
<AppenderRef ref="SyslogAppender"/>
|
||||||
<!-- <AppenderRef ref="LogFileAppender"/> -->
|
<!-- <AppenderRef ref="LogFileAppender"/> -->
|
||||||
|
@ -39,6 +39,7 @@ import java.util.function.Supplier;
|
|||||||
import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
|
import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
|
||||||
import com.kingsrook.qqq.backend.core.context.QContext;
|
import com.kingsrook.qqq.backend.core.context.QContext;
|
||||||
import com.kingsrook.qqq.backend.core.exceptions.QException;
|
import com.kingsrook.qqq.backend.core.exceptions.QException;
|
||||||
|
import com.kingsrook.qqq.backend.core.exceptions.QNotFoundException;
|
||||||
import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException;
|
import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException;
|
||||||
import com.kingsrook.qqq.backend.core.logging.QLogger;
|
import com.kingsrook.qqq.backend.core.logging.QLogger;
|
||||||
import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
|
import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
|
||||||
@ -208,6 +209,11 @@ public class BaseAPIActionUtil
|
|||||||
|
|
||||||
return rs;
|
return rs;
|
||||||
}
|
}
|
||||||
|
catch(QNotFoundException qnfe)
|
||||||
|
{
|
||||||
|
LOG.info("Not found", qnfe);
|
||||||
|
throw new QException("Error executing get: " + qnfe.getMessage(), qnfe);
|
||||||
|
}
|
||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
LOG.error("Error in API get", e);
|
LOG.error("Error in API get", e);
|
||||||
|
Reference in New Issue
Block a user