Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1872 from michael2012z/private/fengyangz/CA-272606

Browse Source 
CA-272606: AD user can not log out when closing XenCenter.
This commit is contained in:
Mihaela Stoica 2017-11-28 14:31:38 +00:00 committed by GitHub
commit 343311635d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Program.cs
View File

@ -527,7 +527,7 @@ namespace XenAdmin
// The application is about to exit - gracefully close connections to
// avoid a bunch of WinForms related race conditions...
foreach (Network.IXenConnection conn in ConnectionsManager.XenConnectionsCopy)
conn.EndConnect(false);
conn.EndConnect(false, true);
}
private static void logApplicationStats()

4
XenModel/Network/IXenConnection.cs
View File

@ -61,7 +61,7 @@ namespace XenAdmin.Network
Session DuplicateSession();
Session DuplicateSession(int timeout);
void EndConnect();
void EndConnect(bool resetState);
void EndConnect(bool resetState, bool exiting = false);
void Interrupt();
Session Connect(string user, string password);
List<string> PoolMembers { get; set; }
@ -103,7 +103,7 @@ namespace XenAdmin.Network
/// until the timeout is reached (default 20s).
/// </summary>
/// <param name="session">May be null, in which case nothing happens.</param>
void Logout(Session session);
void Logout(Session session, bool exiting = false);
}
public class ConnectionResultEventArgs : EventArgs

32
XenModel/Network/XenConnection.cs
View File

@ -757,11 +757,11 @@ namespace XenAdmin.Network
}
/// <param name="resetState">Whether the cache should be cleared (requires invoking onto the GUI thread)</param>
public void EndConnect(bool resetState)
public void EndConnect(bool resetState, bool exiting = false)
{
ConnectTask t = connectTask;
connectTask = null;
EndConnect(resetState, t);
EndConnect(resetState, t, exiting);
}
/// <summary>
@ -770,7 +770,7 @@ namespace XenAdmin.Network
/// </summary>
/// <param name="clearCache">Whether the cache should be cleared (requires invoking onto the GUI thread)</param>
/// <param name="task"></param>
private void EndConnect(bool clearCache, ConnectTask task)
private void EndConnect(bool clearCache, ConnectTask task, bool exiting)
{
OnBeforeConnectionEnd();
@ -784,7 +784,7 @@ namespace XenAdmin.Network
task.Session = null;
if (session != null)
{
Logout(session);
Logout(session, exiting);
}
}
}
@ -817,17 +817,27 @@ namespace XenAdmin.Network
/// a XenAPI.Failure (which is better than them hanging around forever).
/// Do on a background thread - otherwise, if the master has died, then this will block
/// until the timeout is reached (default 20s).
/// However, in the case of exiting, the thread need to be set as foreground.
/// Otherwise the logging out operation can be terminated when other foreground threads finish.
/// </summary>
/// <param name="session">May be null, in which case nothing happens.</param>
public void Logout(Session session)
public void Logout(Session session, bool exiting = false)
{
if (session == null || session.uuid == null)
return;
Thread t = new Thread(Logout_);
t.Name = string.Format("Logging out session {0}", session.uuid);
t.IsBackground = true;
t.Priority = ThreadPriority.Lowest;
if (exiting)
{
t.IsBackground = false;
t.Priority = ThreadPriority.AboveNormal;
}
else
{
t.IsBackground = true;
t.Priority = ThreadPriority.Lowest;
}
t.Start(session);
}
@ -1436,7 +1446,7 @@ namespace XenAdmin.Network
if (error is ExpressRestriction)
{
EndConnect(true, task);
EndConnect(true, task, false);
ExpressRestriction e = (ExpressRestriction)error;
string msg = string.Format(Messages.CONNECTION_RESTRICTED_MESSAGE, e.HostName, e.ExistingHostName);
@ -1450,7 +1460,7 @@ namespace XenAdmin.Network
}
else if (error is ServerNotSupported)
{
EndConnect(true, task);
EndConnect(true, task, false);
log.Info(error.Message);
OnConnectionResult(false, error.Message, error);
}
@ -1458,7 +1468,7 @@ namespace XenAdmin.Network
{
task.Connected = false;
log.InfoFormat("IXenConnection: closing connection to {0}", this.HostnameWithPort);
EndConnect(true, task);
EndConnect(true, task, false);
OnConnectionClosed();
}
else if (task.Connected)
@ -1589,7 +1599,7 @@ namespace XenAdmin.Network
bool ha_enabled = IsHAEnabled();
// NB line below clears the cache
EndConnect(true, task);
EndConnect(true, task, false);
string description;
LastMasterHostname = Hostname;