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

Use stateless flag from toolkit.ini it is present to override value in $_options array. #39

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use stateless flag from toolkit.ini it is present to override value in $_options array. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcacdc6
Rebasing: Use stateless flag from toolkit.ini it is present to overri…
Scott-Cam Feb 16, 2015
11c949c
Rebasing and re-applying changes
Scott-Cam Nov 6, 2016
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
10 changes: 8 additions & 2 deletions ToolkitApi/Toolkit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class Toolkit
'sbmjobCommand' => '', // optional complete override of SBMJOB command when new toolkit job is submitted
'prestart' => false,
'stateless' => false,
'stateless_mode_default' => true, // add new stateless flag for toolkit (non CW)
'performance' => false, // whether to enable performance collection (not fully implemented)
'idleTimeout' => '', // created for Compat. Wrapper (CW)
'cdata' => true, // whether to ask XMLSERVICE to wrap its output in CDATA to protect reserved XML characters
Expand Down Expand Up @@ -144,7 +145,7 @@ public function __construct($databaseNameOrResource, $userOrI5NamingFlag = '0',
}

// Optional params. Don't specify if not given in INI.
$this->getOptionalParams('system', array('v5r4', 'ccsidBefore', 'ccsidAfter', 'useHex', 'paseCcsid', 'trace', 'dataStructureIntegrity', 'arrayIntegrity'));
$this->getOptionalParams('system', array('stateless_mode_default','stateless','v5r4', 'ccsidBefore', 'ccsidAfter', 'useHex', 'paseCcsid', 'trace', 'dataStructureIntegrity', 'arrayIntegrity'));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alanseiden Don't include 'stateless' here. That's only for the CW.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alanseiden Around line 157, try something like:

if ($this->getConfigValue('system', 'stateless_mode_default')) {
            $this->serviceParams['stateless'] = $this->getConfigValue('system', 'stateless_mode_default');
        }

$this->getOptionalParams('transport', array('httpTransportUrl', 'plugSize'));

// populate serviceParams with $transport, or get it from INI
Expand Down Expand Up @@ -1734,7 +1735,12 @@ public function getInternalKey()
*/
public function isStateless()
{
return $this->getOption('stateless');
if ($this->getIsCw()){
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alanseiden This isn't the place to make this change. 'stateless' from getOptions() is still the value to check.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alan, see above comment about line 157.

return $this->getOption('stateless');
}
else{
return $this->getOption('stateless_mode_default');
}
}

/**
Expand Down
9 changes: 7 additions & 2 deletions ToolkitApi/toolkit.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,13 @@ dataStructureIntegrity = true
; For backward compatibility with pre-1.4.0, set to false.
arrayIntegrity = true

; CW only: stateless mode is default for i5_connect (though automatically overridden if private conns are used)
stateless = true
; CW stateless flag
; stateless mode is default for i5_connect (though automatically overridden if private conns are used)
stateless = false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alanseiden stateless flag for CW should be true by default as it currently is.

; Non-CW Stateless flag - default to true
; This should be overridden if you require stateful connections
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alanseiden Suggested comments instead:

; Non-CW (regular toolkit) Stateless default flag
; Set the default value of 'stateless' option, for the regular toolkit (not CW).

; Set the default value of 'stateless' to true, for the regular toolkit (not CW).
stateless_mode_default = true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alanseiden Should default to false to retain traditional behavior (don't break applications by mistake).


[transport]
; transport type allows configuration of transport from this INI.
Expand Down