error_log field

2025-01-10 15:12:59 +03:00
parent e815fa201e
commit b2ef6f77b3
4 changed files with 17 additions and 27 deletions
@@ -22,26 +22,6 @@
 								<cfset this.config.environment = "dev-default" />
 								<cfset this.config.datasource = "cmdb" />
 								<cfset this.config.is_dev_default = "true" /><!---это виднее в сообщении об ошибке--->	
-								<cfset this.config.auth_domain_suffix = "" /><!---эта строка - например, @nubes.ru - вырезается из имени пользователя, полученного с токеном. Case Insensitive--->	
-								<!---https://kk-dev.nubes.ru/auth/realms/mms/protocol/openid-connect/certs--->
-								<cfset this.config.IDP_certificate = {		
-								"keys": [
-								{
-								"kid": "daZqOfZpc_vz7RLAVDWux6jshjD2lFAr5Z2ZNn1dwLA",
-								"kty": "RSA",
-								"alg": "RS256",
-								"use": "sig",
-								"n": "lQpd1QPTcKr84DLwhW6fOg3KlzvOQUzmrW6AlNFM0Iuiv2RZ5dbHtVaIZMQKTpVy1FbDU70p33rxHgeC_I_7VqzixpX4m2oJrIYkz-hr7hEw93iLRju9XYr5V82jkIL1xLvVASFk7nlnJcMBnGoWXv6j8jhJBD8M5EWNT2hWs6HTpXczYdFCwaVLsGvrUTxnY2iESKEGbahEOfG4LicD7POnMIp-vuEKG-G8aIC7K290uEU8QKSCzKQAQ2viptdO275KAkZUs0r_DDK2msI5SM7JBOTQxAbXyVizsi6idx9yVOoaXCfCb4xYeTg9DVy-oJ2Ukyvs570mEdag6hyURQ",
-								"e": "AQAB",
-								"x5c": [
-								"MIIClTCCAX0CBgF9IxLgpDANBgkqhkiG9w0BAQsFADAOMQwwCgYDVQQDDANtbXMwHhcNMjExMTE1MTAwNzU5WhcNMzExMTE1MTAwOTM5WjAOMQwwCgYDVQQDDANtbXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVCl3VA9NwqvzgMvCFbp86DcqXO85BTOatboCU0UzQi6K/ZFnl1se1VohkxApOlXLUVsNTvSnfevEeB4L8j/tWrOLGlfibagmshiTP6GvuETD3eItGO71divlXzaOQgvXEu9UBIWTueWclwwGcahZe/qPyOEkEPwzkRY1PaFazodOldzNh0ULBpUuwa+tRPGdjaIRIoQZtqEQ58bguJwPs86cwin6+4Qob4bxogLsrb3S4RTxApILMpABDa+Km107bvkoCRlSzSv8MMraawjlIzskE5NDEBtfJWLOyLqJ3H3JU6hpcJ8JvjFh5OD0NXL6gnZSTK+znvSYR1qDqHJRFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFIVMTudYLL/zyPqlZlU5iQz50KTaZGRH9Pl989TR3ECVOGyCuFGSNu0jWw9qIQME/GHYIZhP06XjCnfJNPeQbyZLet+xDw1BcPY4H0otSCTKXqiFL7ToTyrBWSH7/yzco0yWQ1iN4xPZYpltKOYVmNwBc3bSqcJZ7A3apGs6YjtEkkyTGRtRDFypbsnLYcTa/PWKDzei76cXuM8z7+j8TjIiiQRuxsfobAa0zL9DPzIFSuC6EhVOLVep9clafIxpxMMOT2ktA3cpPxkSC1FaAG5msvigHeXVp+KhWZsjHDyj0HloVnOPEOR8CmY/kyO4iHfalN01nTAx3jHda4o/KA="
-								],
-								"x5t": "1l71ENtrLzy7ff8vekF7F-9zRgk",
-								"x5t##S256": "Mupmx2VbSPMyU9VH_MPFKHm7fAMZouJzHjTiixqT91s"
-								}
-								]
-								}
-								/>
 							</cfcatch>
 						</cftry>
 						
@@ -71,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.041";
+		variables.framework.docs.APIVersion="0.042";//новый номер
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
@@ -97,7 +77,17 @@
 <!--- 	<cfset this.orchestrator_authorization_string=createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH")/>
 	<cfif isEmpty(this.orchestrator_authorization_string)>
 		<cfset this.orchestrator_authorization_string = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3"/><!--- *** remove --->
-	</cfif>  --->
+	</cfif>  --->	
+	
+	<cffunction name="rethrow" returntype="void">
+		<!--- https://www.raymondcamden.com/2004/03/09/3089633C-9FA0-606B-3F540AE9642A795F --->
+		<cftry>
+			<cfcatch>
+				<cfrethrow/>
+			</cfcatch>
+		</cftry>
+		<cfthrow type="Context validation error" message="RETHROW() called outside TRY-CATCH"/>
+	</cffunction>
 	

 	<cffunction name="onApplicationStart">		
@@ -91,6 +91,7 @@
 				<m:field>round(extract('epoch' from CURRENT_TIMESTAMP - coalesce(o.dt_finish,CURRENT_TIMESTAMP)),1) as seconds_passed</m:field>
 				<m:field title="Успешно">o.is_successful</m:field>
 				<m:field title="dt_created">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
+				<m:field>o.error_log</m:field>
 			</m:field_set>	
 			from instance_operation o
 			left outer join (select instance_operation_uid, max(version) as version from instance_state
@@ -328,8 +329,6 @@
 		<cfargument name="service_id" type="numeric"/> 
 		
 		<cfreturn CreateObject("component", "instance_ls").generateDefaultName(arguments.service_id)/>
-	</cffunction> --->
-
-	
+	</cffunction> --->	

 </cfcomponent>
@@ -27,7 +27,7 @@
 				<m:field title="instance_operation_uid">iop.instance_operation_uid::text as instance_operation_uid</m:field>
 				<m:field title="svc_operation_cfs_param_id">iop.svc_operation_cfs_param_id</m:field>
 				<m:field title="param_value">iop.param_value</m:field>
-				<m:field title="descr">iop.descr</m:field>
+				<m:field title="descr">iop.note</m:field>
 				<m:field title="dt_created">to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
 				<m:field title="creator_id">iop.creator_id</m:field>
 				<m:field title="svc_operation_cfs_param">sop.svc_operation_cfs_param</m:field>
@@ -187,7 +187,7 @@
 	<cffunction name="checkParam">
 		<cfargument name="svcOperationCfsParamId" type="numeric" required = true/>
 		<cfargument name="paramValue" required = true/>
-		<cfargument name="instanceOperationCfsParamUid" type="guid" required = false/>
+		<cfargument name="instanceOperationCfsParamUid" type="guid" required = false/><!--- передавать для существующего параметра - используется при проверке уникальности --->
 		<!--- *** Вероятно, стоит возвращать конкретную ругань --->
 		<!--- принадлежит ли параметр к данному сервису, проверяется выше  --->
 		<cfquery name="qSvcOperationCfsParam">
@@ -233,6 +233,7 @@
 		
 		<!--- ****** Внимание! Этот код сравнивает параметры одноименных операций, но уникальность должна быть и между create-modify и т.п. --->
 		
+		<!--- *** при этом мы не исключаем уделенные инстансы, что неудобно --->
 		<cfswitch expression=#qSvcOperationCfsParam.unique_scope#>
 			<cfcase value="provider">
 				<cfquery name="qUnique">