Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix this is not function #27

Merged
merged 3 commits into from
Mar 5, 2023
Merged

Fix this is not function #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08a9f18
Update
k2tzumi Mar 5, 2023
b737630
setting pre relase
k2tzumi Mar 5, 2023
7c16ee3
use window.eval
k2tzumi Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .tagpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
releaseBranch = main
versionFile = package.json
majorLabels = major
minorLabels = enhancement,minor
minorLabels = enhancement,minor
command = "make prerelease_for_tagpr"
7 changes: 7 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,10 @@ clean:
undeploy: ## all undeploy Google apps scripts
undeploy:
$(CLASP) undeploy --all


.PHONY: prerelease_for_tagpr
prerelease_for_tagpr: ## Pre release for tagpr
prerelease_for_tagpr:
npm update
git add package-lock.json
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions src/JobBroker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,12 @@ class JobBroker<T extends Parameter> {
scriptLock.releaseLock();

console.info(
`job starting. id: ${parameter.id}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, parameter: ${parameter.parameter}`
`job starting. id: ${parameter.id}, handler: ${parameter.handler}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, parameter: ${parameter.parameter}`
);

try {
const result = this[parameter.handler](
const foo = window;
const result = foo.eval(parameter.handler)(
JSON.parse(parameter.parameter)
);
if (!result) {
Expand All @@ -104,14 +105,14 @@ class JobBroker<T extends Parameter> {
parameter.end_at = this.now;
this.saveJob(popJob);
console.info(
`job success. id: ${parameter.id}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}`
`job success. id: ${parameter.id}, handler: ${parameter.handler}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}`
);
} catch (e) {
parameter.state = "failed";
parameter.end_at = this.now;
this.saveJob(popJob);
console.warn(
`job failed. message: ${e.message}, stack: ${e.stack}, id: ${parameter.id}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}`
`job failed. message: ${e.message}, stack: ${e.stack}, id: ${parameter.id}, handler: ${parameter.handler}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}`
);

this.purgeTimeoutQueue();
Expand Down