Integrate patches from hengsin - IDEMPIERE-3416 Implement the ability to track open DB connections (1007726/1008135)
This commit is contained in:
parent
680cf7f5a7
commit
9bfe040d9b
|
@ -221,6 +221,7 @@ public class ClientAcctProcessor extends SvrProcess
|
||||||
// Run every posting document in own transaction
|
// Run every posting document in own transaction
|
||||||
String innerTrxName = Trx.createTrxName("CAP");
|
String innerTrxName = Trx.createTrxName("CAP");
|
||||||
Trx innerTrx = Trx.get(innerTrxName, true);
|
Trx innerTrx = Trx.get(innerTrxName, true);
|
||||||
|
innerTrx.setDisplayName(getClass().getName()+"_postSession");
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -104,6 +104,7 @@ public class AllocationReset extends SvrProcess
|
||||||
throw new AdempiereUserError(Msg.parseTranslation(getCtx(), "@Mandatory@: @C_AllocationHdr_ID@"));
|
throw new AdempiereUserError(Msg.parseTranslation(getCtx(), "@Mandatory@: @C_AllocationHdr_ID@"));
|
||||||
|
|
||||||
m_trx = Trx.get(Trx.createTrxName("AllocReset"), true);
|
m_trx = Trx.get(Trx.createTrxName("AllocReset"), true);
|
||||||
|
m_trx.setDisplayName(getClass().getName()+"_doIt");
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
if (p_C_AllocationHdr_ID != 0)
|
if (p_C_AllocationHdr_ID != 0)
|
||||||
|
|
|
@ -208,6 +208,7 @@ public class UUIDGenerator extends SvrProcess {
|
||||||
Trx trx = trxName != null ? Trx.get(trxName, false) : null;
|
Trx trx = trxName != null ? Trx.get(trxName, false) : null;
|
||||||
if (trx == null) {
|
if (trx == null) {
|
||||||
trx = Trx.get(Trx.createTrxName(), true);
|
trx = Trx.get(Trx.createTrxName(), true);
|
||||||
|
trx.setDisplayName(UUIDGenerator.class.getName()+"_updateUUID");
|
||||||
localTrx = true;
|
localTrx = true;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -286,6 +286,8 @@ public class DocManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
Trx trx = Trx.get(trxName, true);
|
Trx trx = Trx.get(trxName, true);
|
||||||
|
if (localTrxName != null)
|
||||||
|
trx.setDisplayName(DocManager.class.getName()+"_postDocument");
|
||||||
String error = null;
|
String error = null;
|
||||||
Savepoint savepoint = null;
|
Savepoint savepoint = null;
|
||||||
try
|
try
|
||||||
|
|
|
@ -3571,6 +3571,8 @@ public class GridTable extends AbstractTableModel
|
||||||
//https://jdbc.postgresql.org/documentation/head/query.html#query-with-cursor
|
//https://jdbc.postgresql.org/documentation/head/query.html#query-with-cursor
|
||||||
String trxName = m_virtual ? Trx.createTrxName("Loader") : null;
|
String trxName = m_virtual ? Trx.createTrxName("Loader") : null;
|
||||||
trx = trxName != null ? Trx.get(trxName, true) : null;
|
trx = trxName != null ? Trx.get(trxName, true) : null;
|
||||||
|
if (trx != null)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_openResultSet");
|
||||||
// open Statement (closed by Loader.close)
|
// open Statement (closed by Loader.close)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -163,6 +163,7 @@ public class MConversionRate extends X_C_Conversion_Rate
|
||||||
|
|
||||||
String trxName = Trx.createTrxName();
|
String trxName = Trx.createTrxName();
|
||||||
Trx trx = Trx.get(trxName, true);
|
Trx trx = Trx.get(trxName, true);
|
||||||
|
trx.setDisplayName(MConversionRate.class.getName()+"_setRate");
|
||||||
Properties ctx = Env.getCtx();
|
Properties ctx = Env.getCtx();
|
||||||
MCurrency curFrom = MCurrency.get(ctx, CurFrom_ISO);
|
MCurrency curFrom = MCurrency.get(ctx, CurFrom_ISO);
|
||||||
if (curFrom==null) throw new Exception("Invalid currency " + CurFrom_ISO);
|
if (curFrom==null) throw new Exception("Invalid currency " + CurFrom_ISO);
|
||||||
|
|
|
@ -638,6 +638,7 @@ public class MCost extends X_M_Cost
|
||||||
{
|
{
|
||||||
trxNameUsed = Trx.createTrxName("Cost");
|
trxNameUsed = Trx.createTrxName("Cost");
|
||||||
trx = Trx.get(trxNameUsed, true);
|
trx = Trx.get(trxNameUsed, true);
|
||||||
|
trx.setDisplayName(MCost.class.getName()+"_create");
|
||||||
}
|
}
|
||||||
boolean success = true;
|
boolean success = true;
|
||||||
// For all Products
|
// For all Products
|
||||||
|
|
|
@ -778,6 +778,7 @@ public class MLocation extends X_C_Location implements Comparator<Object>
|
||||||
setErrorMessage(null);
|
setErrorMessage(null);
|
||||||
|
|
||||||
Trx trx = Trx.get(Trx.createTrxName("avt-"), true);
|
Trx trx = Trx.get(Trx.createTrxName("avt-"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_processOnline");
|
||||||
boolean ok = false;
|
boolean ok = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -283,6 +283,7 @@ public class MPackage extends X_M_Package
|
||||||
setErrorMessage(null);
|
setErrorMessage(null);
|
||||||
|
|
||||||
Trx trx = Trx.get(Trx.createTrxName("spt-"), true);
|
Trx trx = Trx.get(Trx.createTrxName("spt-"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_processOnline");
|
||||||
boolean ok = false;
|
boolean ok = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -565,6 +565,7 @@ public class MPayment extends X_C_Payment
|
||||||
setIsApproved(approved);
|
setIsApproved(approved);
|
||||||
|
|
||||||
Trx trx = Trx.get(Trx.createTrxName("ppt-"), true);
|
Trx trx = Trx.get(Trx.createTrxName("ppt-"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_processOnline");
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -116,6 +116,7 @@ public final class MSetup
|
||||||
String adminEmail, String userEmail, boolean isSetInitialPassword)
|
String adminEmail, String userEmail, boolean isSetInitialPassword)
|
||||||
{
|
{
|
||||||
log.info(clientName);
|
log.info(clientName);
|
||||||
|
m_trx.setDisplayName(getClass().getName()+"_createClient");
|
||||||
m_trx.start();
|
m_trx.start();
|
||||||
|
|
||||||
// info header
|
// info header
|
||||||
|
|
|
@ -2047,6 +2047,8 @@ public abstract class PO
|
||||||
l_trxname.setLength(23);
|
l_trxname.setLength(23);
|
||||||
m_trxName = Trx.createTrxName(l_trxname.toString());
|
m_trxName = Trx.createTrxName(l_trxname.toString());
|
||||||
localTrx = Trx.get(m_trxName, true);
|
localTrx = Trx.get(m_trxName, true);
|
||||||
|
localTrx.setDisplayName(getClass().getName()+"_save");
|
||||||
|
localTrx.getConnection();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -3171,6 +3173,8 @@ public abstract class PO
|
||||||
{
|
{
|
||||||
localTrxName = Trx.createTrxName("POdel");
|
localTrxName = Trx.createTrxName("POdel");
|
||||||
localTrx = Trx.get(localTrxName, true);
|
localTrx = Trx.get(localTrxName, true);
|
||||||
|
localTrx.setDisplayName(getClass().getName()+"_delete");
|
||||||
|
localTrx.getConnection();
|
||||||
m_trxName = localTrxName;
|
m_trxName = localTrxName;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -264,6 +264,7 @@ public class CreateForeignKey extends SvrProcess {
|
||||||
Trx trx = null;
|
Trx trx = null;
|
||||||
try {
|
try {
|
||||||
trx = Trx.get(Trx.createTrxName("CreateForeignKey"), true);
|
trx = Trx.get(Trx.createTrxName("CreateForeignKey"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_process_dropConstraint");
|
||||||
int rvalue = DB.executeUpdate(sql.toString(), (Object[]) null, true, trx.getTrxName());
|
int rvalue = DB.executeUpdate(sql.toString(), (Object[]) null, true, trx.getTrxName());
|
||||||
addLog(0, null, new BigDecimal(rvalue), sql.toString());
|
addLog(0, null, new BigDecimal(rvalue), sql.toString());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -302,6 +303,7 @@ public class CreateForeignKey extends SvrProcess {
|
||||||
Trx trx = null;
|
Trx trx = null;
|
||||||
try {
|
try {
|
||||||
trx = Trx.get(Trx.createTrxName("CreateForeignKey"), true);
|
trx = Trx.get(Trx.createTrxName("CreateForeignKey"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_process_addConstraint");
|
||||||
int rvalue = DB.executeUpdate(sql.toString(), (Object[]) null, true, trx.getTrxName());
|
int rvalue = DB.executeUpdate(sql.toString(), (Object[]) null, true, trx.getTrxName());
|
||||||
addLog(0, null, new BigDecimal(rvalue), sql.toString());
|
addLog(0, null, new BigDecimal(rvalue), sql.toString());
|
||||||
if (rvalue == -1)
|
if (rvalue == -1)
|
||||||
|
|
|
@ -192,6 +192,7 @@ public class CreateTableIndex extends SvrProcess {
|
||||||
addLog(Msg.getMsg(getCtx(), "CreateTableIndexCreateTableIndex") + dbTableIndex.indexName);
|
addLog(Msg.getMsg(getCtx(), "CreateTableIndexCreateTableIndex") + dbTableIndex.indexName);
|
||||||
|
|
||||||
Trx trx = Trx.get(Trx.createTrxName("CreateTableIndex"), true);
|
Trx trx = Trx.get(Trx.createTrxName("CreateTableIndex"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_process_createMTableIndex");
|
||||||
try {
|
try {
|
||||||
MTableIndex tableIndex = new MTableIndex(getCtx(), 0, get_TrxName());
|
MTableIndex tableIndex = new MTableIndex(getCtx(), 0, get_TrxName());
|
||||||
tableIndex.setAD_Table_ID(table.getAD_Table_ID());
|
tableIndex.setAD_Table_ID(table.getAD_Table_ID());
|
||||||
|
@ -244,6 +245,7 @@ public class CreateTableIndex extends SvrProcess {
|
||||||
addLog(Msg.getMsg(getCtx(), "CreateTableIndexValidateTableIndex") + tableIndex.getName());
|
addLog(Msg.getMsg(getCtx(), "CreateTableIndexValidateTableIndex") + tableIndex.getName());
|
||||||
addLog(tableIndex.getAD_TableIndex_ID(), null, null, tableIndex.toString(), tableIndex.get_Table_ID(), tableIndex.getAD_TableIndex_ID());
|
addLog(tableIndex.getAD_TableIndex_ID(), null, null, tableIndex.toString(), tableIndex.get_Table_ID(), tableIndex.getAD_TableIndex_ID());
|
||||||
Trx trx = Trx.get(Trx.createTrxName("ValidateTableIndex"), true);
|
Trx trx = Trx.get(Trx.createTrxName("ValidateTableIndex"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_process_validateTableIndex");
|
||||||
try {
|
try {
|
||||||
String result = TableIndexValidate.validateTableIndex(getCtx(), tableIndex, trx.getTrxName(), getProcessInfo());
|
String result = TableIndexValidate.validateTableIndex(getCtx(), tableIndex, trx.getTrxName(), getProcessInfo());
|
||||||
addLog(result);
|
addLog(result);
|
||||||
|
|
|
@ -124,7 +124,10 @@ public abstract class SvrProcess implements ProcessCall
|
||||||
//*** Trx
|
//*** Trx
|
||||||
boolean localTrx = m_trx == null;
|
boolean localTrx = m_trx == null;
|
||||||
if (localTrx)
|
if (localTrx)
|
||||||
|
{
|
||||||
m_trx = Trx.get(Trx.createTrxName("SvrProcess"), true);
|
m_trx = Trx.get(Trx.createTrxName("SvrProcess"), true);
|
||||||
|
m_trx.setDisplayName(getClass().getName()+"_startProcess");
|
||||||
|
}
|
||||||
//
|
//
|
||||||
ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
|
ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
|
||||||
ClassLoader processLoader = getClass().getClassLoader();
|
ClassLoader processLoader = getClass().getClassLoader();
|
||||||
|
|
|
@ -16,6 +16,8 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
package org.compiere.util;
|
package org.compiere.util;
|
||||||
|
|
||||||
|
import java.io.PrintWriter;
|
||||||
|
import java.io.StringWriter;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.sql.Savepoint;
|
import java.sql.Savepoint;
|
||||||
|
@ -32,6 +34,7 @@ import java.util.logging.Level;
|
||||||
import org.adempiere.exceptions.AdempiereException;
|
import org.adempiere.exceptions.AdempiereException;
|
||||||
import org.adempiere.exceptions.DBException;
|
import org.adempiere.exceptions.DBException;
|
||||||
import org.compiere.Adempiere;
|
import org.compiere.Adempiere;
|
||||||
|
import org.compiere.model.MSysConfig;
|
||||||
import org.compiere.model.PO;
|
import org.compiere.model.PO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -84,6 +87,10 @@ public class Trx
|
||||||
private static final Trx.TrxMonitor s_monitor = new Trx.TrxMonitor();
|
private static final Trx.TrxMonitor s_monitor = new Trx.TrxMonitor();
|
||||||
|
|
||||||
private List<TrxEventListener> listeners = new ArrayList<TrxEventListener>();
|
private List<TrxEventListener> listeners = new ArrayList<TrxEventListener>();
|
||||||
|
|
||||||
|
protected Exception trace;
|
||||||
|
|
||||||
|
private String m_displayName;
|
||||||
|
|
||||||
public static void startTrxMonitor()
|
public static void startTrxMonitor()
|
||||||
{
|
{
|
||||||
|
@ -187,6 +194,8 @@ public class Trx
|
||||||
}
|
}
|
||||||
if (!isActive())
|
if (!isActive())
|
||||||
start();
|
start();
|
||||||
|
if (MSysConfig.getBooleanValue("TRACE_ALL_TRX_CONNECTION_GET", false))
|
||||||
|
trace = new Exception();
|
||||||
return m_connection;
|
return m_connection;
|
||||||
} // getConnection
|
} // getConnection
|
||||||
|
|
||||||
|
@ -208,6 +217,7 @@ public class Trx
|
||||||
{
|
{
|
||||||
log.log(Level.SEVERE, "connection", e);
|
log.log(Level.SEVERE, "connection", e);
|
||||||
}
|
}
|
||||||
|
trace = new Exception();
|
||||||
} // setConnection
|
} // setConnection
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -470,6 +480,7 @@ public class Trx
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_connection = null;
|
m_connection = null;
|
||||||
|
trace = null;
|
||||||
m_active = false;
|
m_active = false;
|
||||||
fireAfterCloseEvent();
|
fireAfterCloseEvent();
|
||||||
log.config(m_trxName);
|
log.config(m_trxName);
|
||||||
|
@ -538,7 +549,7 @@ public class Trx
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder("Trx[");
|
StringBuilder sb = new StringBuilder("Trx[");
|
||||||
sb.append(getTrxName())
|
sb.append(getDisplayName())
|
||||||
.append(",Active=").append(isActive())
|
.append(",Active=").append(isActive())
|
||||||
.append("]");
|
.append("]");
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
|
@ -664,6 +675,31 @@ public class Trx
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getStrackTrace()
|
||||||
|
{
|
||||||
|
if (trace != null)
|
||||||
|
{
|
||||||
|
StringWriter stringWriter = new StringWriter();
|
||||||
|
PrintWriter printWriter = new PrintWriter(stringWriter);
|
||||||
|
trace.printStackTrace(printWriter);
|
||||||
|
return stringWriter.getBuffer().toString();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDisplayName()
|
||||||
|
{
|
||||||
|
return m_displayName != null ? m_displayName : m_trxName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDisplayName(String displayName)
|
||||||
|
{
|
||||||
|
m_displayName = displayName;
|
||||||
|
}
|
||||||
|
|
||||||
static class TrxMonitor implements Runnable
|
static class TrxMonitor implements Runnable
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -681,6 +717,10 @@ public class Trx
|
||||||
if (since > trxs[i].getTimeout() * 1000)
|
if (since > trxs[i].getTimeout() * 1000)
|
||||||
{
|
{
|
||||||
trxs[i].log.log(Level.WARNING, "Transaction timeout. Name="+trxs[i].getTrxName() + ", timeout(sec)="+(since / 1000));
|
trxs[i].log.log(Level.WARNING, "Transaction timeout. Name="+trxs[i].getTrxName() + ", timeout(sec)="+(since / 1000));
|
||||||
|
if (trxs[i].trace != null)
|
||||||
|
{
|
||||||
|
trxs[i].log.log(Level.WARNING, "Transaction timeout. Trace:\n" + trxs[i].getStrackTrace());
|
||||||
|
}
|
||||||
trxs[i].rollbackAndCloseOnTimeout();
|
trxs[i].rollbackAndCloseOnTimeout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -695,4 +735,21 @@ public class Trx
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void finalize() throws Throwable {
|
||||||
|
if (m_connection != null && trace != null) {
|
||||||
|
final Trx me = this;
|
||||||
|
Adempiere.getThreadPoolExecutor().schedule(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
if (me.m_connection != null && me.trace != null) {
|
||||||
|
log.log(Level.WARNING, "Trx Not Close: " + me.getStrackTrace());
|
||||||
|
me.trace = null;
|
||||||
|
me.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 2, TimeUnit.SECONDS);
|
||||||
|
}
|
||||||
|
super.finalize();
|
||||||
|
}
|
||||||
} // Trx
|
} // Trx
|
||||||
|
|
|
@ -844,6 +844,8 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
|
||||||
}
|
}
|
||||||
|
|
||||||
trx = Trx.get(get_TrxName(), true);
|
trx = Trx.get(get_TrxName(), true);
|
||||||
|
if (localTrx)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_run");
|
||||||
|
|
||||||
Savepoint savepoint = null;
|
Savepoint savepoint = null;
|
||||||
|
|
||||||
|
|
|
@ -678,7 +678,10 @@ public class MWorkflow extends X_AD_Workflow
|
||||||
MWFProcess retValue = null;
|
MWFProcess retValue = null;
|
||||||
Trx localTrx = null;
|
Trx localTrx = null;
|
||||||
if (trxName == null)
|
if (trxName == null)
|
||||||
|
{
|
||||||
localTrx = Trx.get(Trx.createTrxName("WFP"), true);
|
localTrx = Trx.get(Trx.createTrxName("WFP"), true);
|
||||||
|
localTrx.setDisplayName(getClass().getName()+"_start");
|
||||||
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
retValue = new MWFProcess (this, pi, trxName != null ? trxName : localTrx.getTrxName());
|
retValue = new MWFProcess (this, pi, trxName != null ? trxName : localTrx.getTrxName());
|
||||||
|
|
|
@ -45,6 +45,7 @@ public class PipoDictionaryService implements IDictionaryService {
|
||||||
PackIn packIn = null;
|
PackIn packIn = null;
|
||||||
try {
|
try {
|
||||||
trxName = Trx.createTrxName("PipoDS");
|
trxName = Trx.createTrxName("PipoDS");
|
||||||
|
Trx.get(trxName, true).setDisplayName(getClass().getName()+"_merge");
|
||||||
packIn = new PackIn();
|
packIn = new PackIn();
|
||||||
packIn.setPackageName(context.getBundle().getSymbolicName());
|
packIn.setPackageName(context.getBundle().getSymbolicName());
|
||||||
|
|
||||||
|
|
|
@ -101,6 +101,7 @@ public abstract class AbstractActivator implements BundleActivator, ServiceTrack
|
||||||
}
|
}
|
||||||
|
|
||||||
trxName = Trx.createTrxName("ActSysTrx");
|
trxName = Trx.createTrxName("ActSysTrx");
|
||||||
|
Trx.get(trxName, true).setDisplayName(getClass().getName()+"_getLockPO");
|
||||||
sysconfig.set_TrxName(trxName);
|
sysconfig.set_TrxName(trxName);
|
||||||
return sysconfig;
|
return sysconfig;
|
||||||
}
|
}
|
||||||
|
|
|
@ -129,6 +129,7 @@ public class Incremental2PackActivator extends AbstractActivator {
|
||||||
.first();
|
.first();
|
||||||
if (firstImp == null) {
|
if (firstImp == null) {
|
||||||
Trx trx = Trx.get(Trx.createTrxName(), true);
|
Trx trx = Trx.get(Trx.createTrxName(), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_packIn");
|
||||||
try {
|
try {
|
||||||
Env.getCtx().put("#AD_Client_ID", 0);
|
Env.getCtx().put("#AD_Client_ID", 0);
|
||||||
|
|
||||||
|
|
|
@ -270,6 +270,7 @@ public class AlertProcessor extends AdempiereServer
|
||||||
Trx trx = null;
|
Trx trx = null;
|
||||||
try {
|
try {
|
||||||
trx = Trx.get(Trx.createTrxName("AP_NU"), true);
|
trx = Trx.get(Trx.createTrxName("AP_NU"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+m_model.getName()+"_notifyUsers");
|
||||||
// Notice
|
// Notice
|
||||||
int AD_Message_ID = 52244; /* TODO - Hardcoded message=notes */
|
int AD_Message_ID = 52244; /* TODO - Hardcoded message=notes */
|
||||||
MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName());
|
MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName());
|
||||||
|
|
|
@ -115,6 +115,7 @@ public class Scheduler extends AdempiereServer
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
m_trx = Trx.get(Trx.createTrxName("Scheduler"), true);
|
m_trx = Trx.get(Trx.createTrxName("Scheduler"), true);
|
||||||
|
m_trx.setDisplayName(getClass().getName()+"_"+getModel().getName()+"_doWork");
|
||||||
m_summary.append(runProcess(process));
|
m_summary.append(runProcess(process));
|
||||||
m_trx.commit(true);
|
m_trx.commit(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -957,8 +957,13 @@ public class AdempiereMonitor extends HttpServlet
|
||||||
{
|
{
|
||||||
line = new tr();
|
line = new tr();
|
||||||
line.addElement(new th().addElement("Active Transaction "));
|
line.addElement(new th().addElement("Active Transaction "));
|
||||||
line.addElement(new td().addElement("Name="+trx.getTrxName()
|
td td = new td();
|
||||||
+ ", StartTime=" + trx.getStartTime()));
|
td.setOnClick("var newwindow=window.open('','Popup', 'width=800,height=600');newwindow.document.write('<title>" + escapeEcmaScript(trx.getDisplayName()) +"</title>"
|
||||||
|
+ "<pre>" + escapeEcmaScript(trx.getStrackTrace()) + "</pre>')");
|
||||||
|
td.addElement("Name="+trx.getDisplayName() + ", StartTime=" + trx.getStartTime());
|
||||||
|
td.setTitle("Click to see stack trace");
|
||||||
|
td.setStyle("text-decoration: underline; color: blue");
|
||||||
|
line.addElement(td);
|
||||||
table.addElement(line);
|
table.addElement(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1247,4 +1252,14 @@ public class AdempiereMonitor extends HttpServlet
|
||||||
|
|
||||||
return dirAccessList;
|
return dirAccessList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final String escapeEcmaScript(String input) {
|
||||||
|
input = input.replace("'", "\\'");
|
||||||
|
input = input.replace("\"", "\\\"");
|
||||||
|
input = input.replace("\\", "\\\\");
|
||||||
|
input = input.replace("/", "\\/");
|
||||||
|
input = input.replace("\n", "\\n");
|
||||||
|
input = input.replace("\t", "\\t");
|
||||||
|
return input;
|
||||||
|
}
|
||||||
} // AdempiereMonitor
|
} // AdempiereMonitor
|
||||||
|
|
|
@ -260,6 +260,7 @@ public class FeedbackRequestWindow extends Window implements EventListener<Event
|
||||||
|
|
||||||
protected void saveRequest() throws IOException {
|
protected void saveRequest() throws IOException {
|
||||||
Trx trx = Trx.get(Trx.createTrxName("SaveNewRequest"), true);
|
Trx trx = Trx.get(Trx.createTrxName("SaveNewRequest"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_saveRequest");
|
||||||
try {
|
try {
|
||||||
trx.start();
|
trx.start();
|
||||||
MRequest request = createMRequest(trx);
|
MRequest request = createMRequest(trx);
|
||||||
|
|
|
@ -846,6 +846,7 @@ public class WBOMDrop extends ADForm implements EventListener<Event>
|
||||||
{
|
{
|
||||||
String trxName = Trx.createTrxName("BDP");
|
String trxName = Trx.createTrxName("BDP");
|
||||||
Trx localTrx = Trx.get(trxName, true); //trx needs to be committed too
|
Trx localTrx = Trx.get(trxName, true); //trx needs to be committed too
|
||||||
|
localTrx.setDisplayName(getClass().getName()+"_onSave");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (cmd_save(localTrx))
|
if (cmd_save(localTrx))
|
||||||
|
|
|
@ -634,6 +634,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
|
||||||
Trx trx = null;
|
Trx trx = null;
|
||||||
try {
|
try {
|
||||||
trx = Trx.get(Trx.createTrxName("FWFA"), true);
|
trx = Trx.get(Trx.createTrxName("FWFA"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_onOK");
|
||||||
m_activity.set_TrxName(trx.getTrxName());
|
m_activity.set_TrxName(trx.getTrxName());
|
||||||
|
|
||||||
if (forward != null)
|
if (forward != null)
|
||||||
|
|
|
@ -160,6 +160,7 @@ public class ADTreeOnDropListener implements EventListener<Event> {
|
||||||
|
|
||||||
// *** Save changes to disk
|
// *** Save changes to disk
|
||||||
Trx trx = Trx.get (Trx.createTrxName("ADTree"), true);
|
Trx trx = Trx.get (Trx.createTrxName("ADTree"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_moveNode");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
|
|
|
@ -316,6 +316,7 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
|
||||||
{
|
{
|
||||||
String trxName = Trx.createTrxName("ChangePasswordTrx");
|
String trxName = Trx.createTrxName("ChangePasswordTrx");
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_validateChangePassword");
|
||||||
|
|
||||||
for (KeyNamePair clientKNPair : m_clientKNPairs)
|
for (KeyNamePair clientKNPair : m_clientKNPairs)
|
||||||
{
|
{
|
||||||
|
|
|
@ -450,6 +450,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
|
||||||
{
|
{
|
||||||
String trxName = Trx.createTrxName("ResetPasswordTrx");
|
String trxName = Trx.createTrxName("ResetPasswordTrx");
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_validateResetPassword");
|
||||||
|
|
||||||
for (MUser user : users)
|
for (MUser user : users)
|
||||||
{
|
{
|
||||||
|
|
|
@ -149,6 +149,7 @@ public class GridTabDataBinder implements ValueChangeListener {
|
||||||
int recordId = gridTab.getKeyID(gridTab.getCurrentRow());
|
int recordId = gridTab.getKeyID(gridTab.getCurrentRow());
|
||||||
|
|
||||||
Trx trx = Trx.get(Trx.createTrxName(), true);
|
Trx trx = Trx.get(Trx.createTrxName(), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_valueChange");
|
||||||
trx.start();
|
trx.start();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -101,6 +101,7 @@ public class WGadgets extends Window implements EventListener<Event>{
|
||||||
if (panel.getButton("Ok").equals(event.getTarget()))
|
if (panel.getButton("Ok").equals(event.getTarget()))
|
||||||
{
|
{
|
||||||
Trx trx = Trx.get(Trx.createTrxName("ManagedGadgets"), true);
|
Trx trx = Trx.get(Trx.createTrxName("ManagedGadgets"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_onEvent_onOk");
|
||||||
try {
|
try {
|
||||||
trx.start();
|
trx.start();
|
||||||
for(MDashboardPreference pre : dirtyList.values()) {
|
for(MDashboardPreference pre : dirtyList.values()) {
|
||||||
|
|
|
@ -915,6 +915,7 @@ public class WLocationDialog extends Window implements EventListener<Event>
|
||||||
private boolean action_OK()
|
private boolean action_OK()
|
||||||
{
|
{
|
||||||
Trx trx = Trx.get(Trx.createTrxName("WLocationDialog"), true);
|
Trx trx = Trx.get(Trx.createTrxName("WLocationDialog"), true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_action_Ok");
|
||||||
m_location.set_TrxName(trx.getTrxName());
|
m_location.set_TrxName(trx.getTrxName());
|
||||||
m_location.setAddress1(txtAddress1.getValue());
|
m_location.setAddress1(txtAddress1.getValue());
|
||||||
m_location.setAddress2(txtAddress2.getValue());
|
m_location.setAddress2(txtAddress2.getValue());
|
||||||
|
|
|
@ -247,6 +247,7 @@ public class InOutGen extends GenForm
|
||||||
if (log.isLoggable(Level.INFO)) log.info("M_Warehouse_ID=" + m_M_Warehouse_ID);
|
if (log.isLoggable(Level.INFO)) log.info("M_Warehouse_ID=" + m_M_Warehouse_ID);
|
||||||
String trxName = Trx.createTrxName("IOG");
|
String trxName = Trx.createTrxName("IOG");
|
||||||
Trx trx = Trx.get(trxName, true); //trx needs to be committed too
|
Trx trx = Trx.get(trxName, true); //trx needs to be committed too
|
||||||
|
trx.setDisplayName(getClass().getName()+"_generate");
|
||||||
|
|
||||||
setSelectionActive(false); // prevents from being called twice
|
setSelectionActive(false); // prevents from being called twice
|
||||||
statusBar.setStatusLine(Msg.getMsg(Env.getCtx(), "InOutGenerateGen"));
|
statusBar.setStatusLine(Msg.getMsg(Env.getCtx(), "InOutGenerateGen"));
|
||||||
|
|
|
@ -247,6 +247,7 @@ public class InvoiceGen extends GenForm
|
||||||
String info = "";
|
String info = "";
|
||||||
String trxName = Trx.createTrxName("IVG");
|
String trxName = Trx.createTrxName("IVG");
|
||||||
Trx trx = Trx.get(trxName, true); //trx needs to be committed too
|
Trx trx = Trx.get(trxName, true); //trx needs to be committed too
|
||||||
|
trx.setDisplayName(getClass().getName()+"_generate");
|
||||||
|
|
||||||
setSelectionActive(false); // prevents from being called twice
|
setSelectionActive(false); // prevents from being called twice
|
||||||
statusBar.setStatusLine(Msg.getMsg(Env.getCtx(), "InvGenerateGen"));
|
statusBar.setStatusLine(Msg.getMsg(Env.getCtx(), "InvGenerateGen"));
|
||||||
|
|
|
@ -206,6 +206,7 @@ public class Match
|
||||||
// Create it
|
// Create it
|
||||||
String innerTrxName = Trx.createTrxName("Match");
|
String innerTrxName = Trx.createTrxName("Match");
|
||||||
Trx innerTrx = Trx.get(innerTrxName, true);
|
Trx innerTrx = Trx.get(innerTrxName, true);
|
||||||
|
innerTrx.setDisplayName(getClass().getName()+"_cmd_process");
|
||||||
|
|
||||||
try{
|
try{
|
||||||
if (createMatchRecord(invoice, M_InOutLine_ID, Line_ID, BigDecimal.valueOf(qty), innerTrxName))
|
if (createMatchRecord(invoice, M_InOutLine_ID, Line_ID, BigDecimal.valueOf(qty), innerTrxName))
|
||||||
|
|
|
@ -114,8 +114,9 @@ public class Merge
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
m_trx = Trx.get(Trx.createTrxName("merge"), true);
|
m_trx = Trx.get(Trx.createTrxName("merge"), true);
|
||||||
|
m_trx.setDisplayName(getClass().getName()+"_merge");
|
||||||
//
|
//
|
||||||
pstmt = DB.prepareStatement(sql, Trx.createTrxName());
|
pstmt = DB.prepareStatement(sql, m_trx.getTrxName());
|
||||||
pstmt.setString(1, ColumnName);
|
pstmt.setString(1, ColumnName);
|
||||||
pstmt.setString(2, ColumnName);
|
pstmt.setString(2, ColumnName);
|
||||||
rs = pstmt.executeQuery();
|
rs = pstmt.executeQuery();
|
||||||
|
|
|
@ -93,6 +93,7 @@ public class CompositeServiceImpl extends AbstractService implements CompositeSe
|
||||||
String trxName = Trx.createTrxName(webServiceName);
|
String trxName = Trx.createTrxName(webServiceName);
|
||||||
|
|
||||||
Trx trx = Trx.get(trxName, true);
|
Trx trx = Trx.get(trxName, true);
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+webServiceName+"_compositeOperation");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
modelADService.setLocalTrxName(trxName);
|
modelADService.setLocalTrxName(trxName);
|
||||||
|
|
|
@ -214,6 +214,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
}
|
}
|
||||||
|
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
if (manageTrx)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+webServiceName+"_setDocAction");
|
||||||
|
|
||||||
Map<String, Object> requestCtx = getRequestCtx();
|
Map<String, Object> requestCtx = getRequestCtx();
|
||||||
|
|
||||||
|
@ -698,6 +700,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
}
|
}
|
||||||
|
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
if (manageTrx)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+webServiceName+"_deleteData");
|
||||||
|
|
||||||
// get the PO for the tablename and record ID
|
// get the PO for the tablename and record ID
|
||||||
MTable table = MTable.get(ctx, tableName);
|
MTable table = MTable.get(ctx, tableName);
|
||||||
|
@ -780,6 +784,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
}
|
}
|
||||||
|
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
if (manageTrx)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+webServiceName+"_createData");
|
||||||
|
|
||||||
|
|
||||||
// get the PO for the tablename and record ID
|
// get the PO for the tablename and record ID
|
||||||
|
@ -892,6 +898,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
manageTrx = true;
|
manageTrx = true;
|
||||||
}
|
}
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
if (manageTrx)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+webServiceName+"_createUpdateData");
|
||||||
|
|
||||||
// get the PO for the tablename and record ID
|
// get the PO for the tablename and record ID
|
||||||
MTable table = MTable.get(ctx, tableName);
|
MTable table = MTable.get(ctx, tableName);
|
||||||
|
@ -1272,6 +1280,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
}
|
}
|
||||||
|
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
if (manageTrx)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+webServiceName+"_updateData");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1464,6 +1474,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
manageTrx = true;
|
manageTrx = true;
|
||||||
}
|
}
|
||||||
trx = Trx.get(trxName, true);
|
trx = Trx.get(trxName, true);
|
||||||
|
if (manageTrx)
|
||||||
|
trx.setDisplayName(getClass().getName()+"_"+webServiceName+"_queryData");
|
||||||
|
|
||||||
StringBuilder sqlBuilder = new StringBuilder(role.addAccessSQL("SELECT * FROM " + tableName, tableName, true, true));
|
StringBuilder sqlBuilder = new StringBuilder(role.addAccessSQL("SELECT * FROM " + tableName, tableName, true, true));
|
||||||
|
|
||||||
|
|
|
@ -340,6 +340,8 @@ public class Process {
|
||||||
if (process.isJavaProcess() && !jasperreport)
|
if (process.isJavaProcess() && !jasperreport)
|
||||||
{
|
{
|
||||||
Trx trx = trxName == null ? Trx.get(Trx.createTrxName("WebPrc"), true) : Trx.get(trxName, true);
|
Trx trx = trxName == null ? Trx.get(Trx.createTrxName("WebPrc"), true) : Trx.get(trxName, true);
|
||||||
|
if (trxName == null)
|
||||||
|
trx.setDisplayName(Process.class.getName()+"_runProcess");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
processOK = process.processIt(pi, trx, false);
|
processOK = process.processIt(pi, trx, false);
|
||||||
|
|
Loading…
Reference in New Issue