AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small changes and fixes for jobrunner

Browse Source
This commit is contained in:
Jonathan Jenne
2019-04-23 16:16:58 +02:00
parent 3bd9c04b9c
commit 0bf0f8a05d
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Modules.Interfaces/ActiveDirectoryInterface.vb
View File

@@ -52,8 +52,8 @@ Public Class ActiveDirectoryInterface
Dim oSyncedUsers As New List(Of ADUser)
Dim oGroupId As Int64 = Nothing
Dim oFirebirdSync As New SyncUsers.Firebird(_logConfig, _firebird)
Dim oSQLSync As New SyncUsers.MSSQL(_logConfig, _mssql)
Dim oFirebirdSync As New SyncUsers.FirebirdSync(_logConfig, _firebird)
Dim oSQLSync As New SyncUsers.MSSQLSync(_logConfig, _mssql)
Dim oSyncedUsersFirebird, oSyncedUsersMSSQL As List(Of ADUser)
Try
@@ -73,13 +73,17 @@ Public Class ActiveDirectoryInterface
' Do the actual sync into firebird
If _firebird IsNot Nothing Then
oSyncedUsersFirebird = oFirebirdSync.SyncUsers(GroupName, oUsers, AttributeMappings)
_logger.Info("Synced {0} users to Firebird", oSyncedUsersFirebird.Count)
If oSyncedUsersFirebird.Count > 0 Then
_logger.Info("Synced {0} users to Firebird", oSyncedUsersFirebird.Count)
End If
End If
' Do the actual sync into MSSQL
If _mssql IsNot Nothing Then
oSyncedUsersMSSQL = oSQLSync.SyncUsers(GroupName, oUsers, AttributeMappings)
_logger.Info("Synced {0} users to MSSQLServer", oSyncedUsersMSSQL.Count)
If oSyncedUsersMSSQL.Count > 0 Then
_logger.Info("Synced {0} users to MSSQLServer", oSyncedUsersMSSQL.Count)
End If
End If
Return oUsers
@@ -180,7 +184,7 @@ Public Class ActiveDirectoryInterface
_logger.Warn("Could not fetch CustomAttributes for user {0}", oUser)
End If
_logger.Info("Trying to add User {0} to user list", oUser)
_logger.Debug("Trying to add User {0} to user list", oUser)
Dim oNewUser As New ADUser With {
.SId = oUser.Sid,