sasjs/core
1
0
Fork 0
mirror of https://github.com/sasjs/core.git synced 2026-01-14 03:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49 from sasjs/logfix

Browse Source 
Context fixes on mv_jobflow and mp_testservice
This commit is contained in:
Allan Bowe
2021-06-27 00:35:24 +03:00
committed by GitHub
parent 929a1a9974 55d4c7238a
commit 93aea5ed02
6 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
all.sas
View File

@@ -6363,8 +6363,11 @@ libname &lib clear;
|mustbevalidname|can be anything, oops, %abort!!| |mustbevalidname|can be anything, oops, %abort!!|
@param [in] debug= (log) Provide the _debug value @param [in] debug= (log) Provide the _debug value
@param [in] viyaresult=(WEBOUT_JSON) The Viya result type to return. For @param [in] mdebug= (0) Set to 1 to provide macro debugging
@param [in] viyaresult= (WEBOUT_JSON) The Viya result type to return. For
more info, see mv_getjobresult.sas more info, see mv_getjobresult.sas
@param [in] viyacontext= (SAS Job Execution compute context) The Viya compute
context on which to run the service
@param [out] outlib= (0) Output libref to contain the final tables. Set to @param [out] outlib= (0) Output libref to contain the final tables. Set to
0 if the service output is not in JSON format. 0 if the service output is not in JSON format.
@param [out] outref= (0) Output fileref to create, to contain the full _webout @param [out] outref= (0) Output fileref to create, to contain the full _webout
@@ -6388,17 +6391,18 @@ libname &lib clear;
inputfiles=0, inputfiles=0,
inputparams=0, inputparams=0,
debug=log, debug=log,
mdebug=0,
outlib=0, outlib=0,
outref=0, outref=0,
viyaresult=WEBOUT_JSON viyaresult=WEBOUT_JSON,
viyacontext=SAS Job Execution compute context
)/*/STORE SOURCE*/; )/*/STORE SOURCE*/;
%local mdebug; %local dbg;
%if &debug ne 0 %then %do; %if &mdebug=1 %then %do;
%let mdebug=1;
%put &sysmacroname entry vars:; %put &sysmacroname entry vars:;
%put _local_; %put _local_;
%end; %end;
%else %let mdebug=0; %else %let dbg=*;
/* sanitise inputparams */ /* sanitise inputparams */
%local pcnt; %local pcnt;
@@ -6553,6 +6557,7 @@ libname &lib clear;
data &ds1; data &ds1;
retain _program "&program"; retain _program "&program";
retain _contextname "&viyacontext";
set &ds1; set &ds1;
putlog "&sysmacroname inputparams:"; putlog "&sysmacroname inputparams:";
putlog (_all_)(=); putlog (_all_)(=);
@@ -15570,7 +15575,7 @@ run;
@param [in] access_token_var= The global macro variable to contain the access @param [in] access_token_var= The global macro variable to contain the access
token token
@param [in] mdebug= set to 1 to enable DEBUG messages @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
@param [in] grant_type= valid values: @param [in] grant_type= valid values:
@li password @li password
@li authorization_code @li authorization_code
@@ -15595,7 +15600,6 @@ run;
**/ **/
%macro mv_getjoblog(uri=0,outref=0 %macro mv_getjoblog(uri=0,outref=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN ,access_token_var=ACCESS_TOKEN
,grant_type=sas_services ,grant_type=sas_services
,mdebug=0 ,mdebug=0
@@ -15916,7 +15920,6 @@ run;
**/ **/
%macro mv_getjobresult(uri=0 %macro mv_getjobresult(uri=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN ,access_token_var=ACCESS_TOKEN
,grant_type=sas_services ,grant_type=sas_services
,mdebug=0 ,mdebug=0
@@ -16030,10 +16033,11 @@ proc http method='GET' out=&fname2 &oauth_bearer
; ;
run; run;
%if &mdebug=1 %then %do; %if &mdebug=1 %then %do;
/* send one char at a time as the json can be very wide */
data _null_; data _null_;
infile &fname2 lrecl=32767; infile &fname2 recfm=n;
input; input char $char1. ;
putlog _infile_; putlog char $char1. @;
run; run;
%end; %end;
@@ -16790,6 +16794,11 @@ run;
%if &mdebug=1 %then %do; %if &mdebug=1 %then %do;
%put &sysmacroname entry vars:; %put &sysmacroname entry vars:;
%put _local_; %put _local_;
%put inds vars:;
data _null_;
set &inds;
putlog (_all_)(=);
run;
%end; %end;
%else %let dbg=*; %else %let dbg=*;
@@ -16834,6 +16843,7 @@ run;
retain FLOW_ID 0; retain FLOW_ID 0;
%end; %end;
set &inds; set &inds;
&dbg. putlog (_all_)(=);
run; run;
%end; %end;
@@ -16898,6 +16908,8 @@ data;run;%let jdswaitfor=&syslast;
call symputx(cats('job',_n_),_program,'l'); call symputx(cats('job',_n_),_program,'l');
call symputx(cats('context',_n_),_contextName,'l'); call symputx(cats('context',_n_),_contextName,'l');
call symputx('jcnt',_n_,'l'); call symputx('jcnt',_n_,'l');
&dbg. if _n_= 1 then putlog "Loop &fid";
&dbg. putlog (_all_)(=);
run; run;
%put exporting job variables in json format; %put exporting job variables in json format;
%do jid=1 %to &jcnt; %do jid=1 %to &jcnt;
@@ -16959,6 +16971,7 @@ data;run;%let jdswaitfor=&syslast;
,name=&jobname ,name=&jobname
,paramstring=%superq(jparams&jid) ,paramstring=%superq(jparams&jid)
,outds=&jdsapp ,outds=&jdsapp
,contextname=&&context&jid
) )
data &jdsapp; data &jdsapp;
format jobparams $32767.; format jobparams $32767.;

17
base/mp_testservice.sas
View File

@@ -22,8 +22,11 @@
|mustbevalidname|can be anything, oops, %abort!!| |mustbevalidname|can be anything, oops, %abort!!|
@param [in] debug= (log) Provide the _debug value @param [in] debug= (log) Provide the _debug value
@param [in] viyaresult=(WEBOUT_JSON) The Viya result type to return. For @param [in] mdebug= (0) Set to 1 to provide macro debugging
@param [in] viyaresult= (WEBOUT_JSON) The Viya result type to return. For
more info, see mv_getjobresult.sas more info, see mv_getjobresult.sas
@param [in] viyacontext= (SAS Job Execution compute context) The Viya compute
context on which to run the service
@param [out] outlib= (0) Output libref to contain the final tables. Set to @param [out] outlib= (0) Output libref to contain the final tables. Set to
0 if the service output is not in JSON format. 0 if the service output is not in JSON format.
@param [out] outref= (0) Output fileref to create, to contain the full _webout @param [out] outref= (0) Output fileref to create, to contain the full _webout
@@ -47,17 +50,18 @@
inputfiles=0, inputfiles=0,
inputparams=0, inputparams=0,
debug=log, debug=log,
mdebug=0,
outlib=0, outlib=0,
outref=0, outref=0,
viyaresult=WEBOUT_JSON viyaresult=WEBOUT_JSON,
viyacontext=SAS Job Execution compute context
)/*/STORE SOURCE*/; )/*/STORE SOURCE*/;
%local mdebug; %local dbg;
%if &debug ne 0 %then %do; %if &mdebug=1 %then %do;
%let mdebug=1;
%put &sysmacroname entry vars:; %put &sysmacroname entry vars:;
%put _local_; %put _local_;
%end; %end;
%else %let mdebug=0; %else %let dbg=*;
/* sanitise inputparams */ /* sanitise inputparams */
%local pcnt; %local pcnt;
@@ -212,6 +216,7 @@
data &ds1; data &ds1;
retain _program "&program"; retain _program "&program";
retain _contextname "&viyacontext";
set &ds1; set &ds1;
putlog "&sysmacroname inputparams:"; putlog "&sysmacroname inputparams:";
putlog (_all_)(=); putlog (_all_)(=);

2
package.json
View File

@@ -33,6 +33,6 @@
"postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true" "postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
}, },
"devDependencies": { "devDependencies": {
"@sasjs/cli": "^2.27.0" "@sasjs/cli": "2.27.0"
} }
} }

3
viya/mv_getjoblog.sas
View File

@@ -66,7 +66,7 @@
@param [in] access_token_var= The global macro variable to contain the access @param [in] access_token_var= The global macro variable to contain the access
token token
@param [in] mdebug= set to 1 to enable DEBUG messages @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
@param [in] grant_type= valid values: @param [in] grant_type= valid values:
@li password @li password
@li authorization_code @li authorization_code
@@ -91,7 +91,6 @@
**/ **/
%macro mv_getjoblog(uri=0,outref=0 %macro mv_getjoblog(uri=0,outref=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN ,access_token_var=ACCESS_TOKEN
,grant_type=sas_services ,grant_type=sas_services
,mdebug=0 ,mdebug=0

8
viya/mv_getjobresult.sas
View File

@@ -90,7 +90,6 @@
**/ **/
%macro mv_getjobresult(uri=0 %macro mv_getjobresult(uri=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN ,access_token_var=ACCESS_TOKEN
,grant_type=sas_services ,grant_type=sas_services
,mdebug=0 ,mdebug=0
@@ -204,10 +203,11 @@ proc http method='GET' out=&fname2 &oauth_bearer
; ;
run; run;
%if &mdebug=1 %then %do; %if &mdebug=1 %then %do;
/* send one char at a time as the json can be very wide */
data _null_; data _null_;
infile &fname2 lrecl=32767; infile &fname2 recfm=n;
input; input char $char1. ;
putlog _infile_; putlog char $char1. @;
run; run;
%end; %end;

9
viya/mv_jobflow.sas
View File

@@ -140,6 +140,11 @@
%if &mdebug=1 %then %do; %if &mdebug=1 %then %do;
%put &sysmacroname entry vars:; %put &sysmacroname entry vars:;
%put _local_; %put _local_;
%put inds vars:;
data _null_;
set &inds;
putlog (_all_)(=);
run;
%end; %end;
%else %let dbg=*; %else %let dbg=*;
@@ -184,6 +189,7 @@
retain FLOW_ID 0; retain FLOW_ID 0;
%end; %end;
set &inds; set &inds;
&dbg. putlog (_all_)(=);
run; run;
%end; %end;
@@ -248,6 +254,8 @@ data;run;%let jdswaitfor=&syslast;
call symputx(cats('job',_n_),_program,'l'); call symputx(cats('job',_n_),_program,'l');
call symputx(cats('context',_n_),_contextName,'l'); call symputx(cats('context',_n_),_contextName,'l');
call symputx('jcnt',_n_,'l'); call symputx('jcnt',_n_,'l');
&dbg. if _n_= 1 then putlog "Loop &fid";
&dbg. putlog (_all_)(=);
run; run;
%put exporting job variables in json format; %put exporting job variables in json format;
%do jid=1 %to &jcnt; %do jid=1 %to &jcnt;
@@ -309,6 +317,7 @@ data;run;%let jdswaitfor=&syslast;
,name=&jobname ,name=&jobname
,paramstring=%superq(jparams&jid) ,paramstring=%superq(jparams&jid)
,outds=&jdsapp ,outds=&jdsapp
,contextname=&&context&jid
) )
data &jdsapp; data &jdsapp;
format jobparams $32767.; format jobparams $32767.;