Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

WIP: 836 - pool.close() should iterate open connections and close them #950

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.

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

Closed
danilohgds wants to merge 18 commits into oracle:master from danilohgds:PR-836
Closed
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7fa2e91
Added NJS-064 to util.js file
danilohgds Jul 18, 2018
e793703
linting fixes.
danilohgds Jul 23, 2018
9563044
WIP: change variable name to poolClosing.
danilohgds Jul 31, 2018
d465911
change variable name
danilohgds Jul 31, 2018
cdb6810
simplify close mode, handle actual DPI constant in cpp layer.
danilohgds Jul 31, 2018
9888617
missing comma.
danilohgds Jul 31, 2018
b06210d
move new pool form tests last
danilohgds Jul 31, 2018
945ae28
fixes - rewrite close wrapper.
danilohgds Aug 1, 2018
86d82dd
change _close call.
danilohgds Aug 4, 2018
78f6e4d
Update njsCommon.h
danilohgds Aug 15, 2018
6be6a41
Update njsPool.cpp
danilohgds Aug 15, 2018
7393a6a
update pool.js
danilohgds Aug 15, 2018
ede8161
update pool.js tests
danilohgds Aug 15, 2018
feafcd0
Update njsPool.cpp
danilohgds Aug 15, 2018
4099ff9
Update njsPool.cpp
danilohgds Aug 15, 2018
5ab1c14
Update pool.js
danilohgds Aug 16, 2018
026f53b
change around argument logic for handling errors
danilohgds Aug 18, 2018
9b6948c
decrease timings.
danilohgds Aug 18, 2018
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
Prev Previous commit
Next Next commit
Update njsPool.cpp 
simplify force close and add logic to ensure 2 args are always passed.
  • Loading branch information
danilohgds authored Aug 15, 2018
commit feafcd02ca377d0304f5c85ac7e4f0a0f795f44e
8 changes: 2 additions & 6 deletions src/njsPool.cpp
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,18 +448,14 @@ NAN_METHOD(njsPool::Close)
njsPool *pool;
bool forceClose;

pool = (njsPool*) ValidateArgs(info, 1, 1);
pool = (njsPool*) ValidateArgs(info, 2, 2);
if (!pool)
return;
baton = pool->CreateBaton(info);
if (!baton)
return;

if (!baton->GetBoolFromJSON(info[0].As<Object>(), "forceClose", 0, &forceClose)){
baton->forceClose = false;
}else{
baton->forceClose = forceClose;
}
baton->GetBoolFromJSON(info[0].As(), "forceClose", 0, &baton->forceClose);

baton->dpiPoolHandle = pool->dpiPoolHandle;
pool->dpiPoolHandle = NULL;
Expand Down

AltStyle によって変換されたページ (->オリジナル) /