Add NodeJS link and fix log target handling
This commit is contained in:
parent
fb07c29e09
commit
61c6297d41
@ -74,6 +74,7 @@
|
|||||||
<cfset request.rabbitAdminUrl = getEnv("RABBIT_ADMIN_URL", "") />
|
<cfset request.rabbitAdminUrl = getEnv("RABBIT_ADMIN_URL", "") />
|
||||||
<cfset request.rabbitUser = getEnv("RABBIT_USER", "") />
|
<cfset request.rabbitUser = getEnv("RABBIT_USER", "") />
|
||||||
<cfset request.rabbitPassword = getEnv("RABBIT_PASSWORD", "") />
|
<cfset request.rabbitPassword = getEnv("RABBIT_PASSWORD", "") />
|
||||||
|
<cfset request.nodeworkerUrl = getEnv("NODEWORKER_URL", "") />
|
||||||
|
|
||||||
<cftry>
|
<cftry>
|
||||||
<cfquery datasource="#request.DS#">
|
<cfquery datasource="#request.DS#">
|
||||||
@ -124,7 +125,7 @@
|
|||||||
<cfset var requestId = createUUID() />
|
<cfset var requestId = createUUID() />
|
||||||
<cfset var payload = { "request_id" = requestId } />
|
<cfset var payload = { "request_id" = requestId } />
|
||||||
<cfset var logText = "" />
|
<cfset var logText = "" />
|
||||||
<cfset var logTargetId = JavaCast("null", "") />
|
<cfset var logTargetId = "" />
|
||||||
|
|
||||||
<cftry>
|
<cftry>
|
||||||
<cfswitch expression="#action#">
|
<cfswitch expression="#action#">
|
||||||
@ -140,7 +141,7 @@
|
|||||||
<cfset payload.action = "update" />
|
<cfset payload.action = "update" />
|
||||||
<cfset payload.id = val(form.id) />
|
<cfset payload.id = val(form.id) />
|
||||||
<cfset logText = trim(form.txt_content) />
|
<cfset logText = trim(form.txt_content) />
|
||||||
<cfset logTargetId = val(form.id) />
|
<cfset logTargetId = toString(val(form.id)) />
|
||||||
<cfset payload.text = logText & " [req:" & requestId & "]" />
|
<cfset payload.text = logText & " [req:" & requestId & "]" />
|
||||||
</cfcase>
|
</cfcase>
|
||||||
<cfcase value="delete">
|
<cfcase value="delete">
|
||||||
@ -149,7 +150,7 @@
|
|||||||
</cfif>
|
</cfif>
|
||||||
<cfset payload.action = "delete" />
|
<cfset payload.action = "delete" />
|
||||||
<cfset payload.id = val(form.id) />
|
<cfset payload.id = val(form.id) />
|
||||||
<cfset logTargetId = val(form.id) />
|
<cfset logTargetId = toString(val(form.id)) />
|
||||||
</cfcase>
|
</cfcase>
|
||||||
<cfdefaultcase>
|
<cfdefaultcase>
|
||||||
<cfthrow message="Unknown action" />
|
<cfthrow message="Unknown action" />
|
||||||
@ -163,7 +164,7 @@
|
|||||||
<cfqueryparam value="#payload.action#" cfsqltype="cf_sql_varchar">,
|
<cfqueryparam value="#payload.action#" cfsqltype="cf_sql_varchar">,
|
||||||
<cfqueryparam value="#logText#" cfsqltype="cf_sql_varchar">,
|
<cfqueryparam value="#logText#" cfsqltype="cf_sql_varchar">,
|
||||||
<cfqueryparam value="#requestId#" cfsqltype="cf_sql_varchar">,
|
<cfqueryparam value="#requestId#" cfsqltype="cf_sql_varchar">,
|
||||||
<cfqueryparam value="#logTargetId#" cfsqltype="cf_sql_integer" null="#isNull(logTargetId)#">,
|
<cfqueryparam value="#logTargetId#" cfsqltype="cf_sql_integer" null="#NOT len(logTargetId)#">,
|
||||||
NOW(),
|
NOW(),
|
||||||
'queued'
|
'queued'
|
||||||
)
|
)
|
||||||
|
|||||||
@ -44,6 +44,7 @@
|
|||||||
<cfset rabbitAdminUrl = request.rabbitAdminUrl>
|
<cfset rabbitAdminUrl = request.rabbitAdminUrl>
|
||||||
<cfset rabbitUser = request.rabbitUser>
|
<cfset rabbitUser = request.rabbitUser>
|
||||||
<cfset rabbitPassword = request.rabbitPassword>
|
<cfset rabbitPassword = request.rabbitPassword>
|
||||||
|
<cfset nodeworkerUrl = request.nodeworkerUrl>
|
||||||
|
|
||||||
<cfquery name="qLog" datasource="#request.DS#">
|
<cfquery name="qLog" datasource="#request.DS#">
|
||||||
SELECT id, action, text, request_id, target_id, queued_at, processed_at, status
|
SELECT id, action, text, request_id, target_id, queued_at, processed_at, status
|
||||||
@ -81,6 +82,9 @@
|
|||||||
<cfelse>
|
<cfelse>
|
||||||
<span class="small">URL не задан</span>
|
<span class="small">URL не задан</span>
|
||||||
</cfif>
|
</cfif>
|
||||||
|
<cfif len(nodeworkerUrl)>
|
||||||
|
<a href="<cfoutput>#nodeworkerUrl#</cfoutput>" target="_blank">Открыть NodeJS Worker</a>
|
||||||
|
</cfif>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user