/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2003 The OpenLDAP Foundation.
+ * Copyright 2001-2005 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
*/
int
monitor_subsys_backend_init(
- BackendDB *be
+ BackendDB *be,
+ monitor_subsys_t *ms
)
{
- struct monitorinfo *mi;
- Entry *e, *e_backend, *e_tmp;
+ monitor_info_t *mi;
+ Entry *e_backend, **ep;
int i;
- struct monitorentrypriv *mp;
+ monitor_entry_t *mp;
+ monitor_subsys_t *ms_database;
- mi = ( struct monitorinfo * )be->be_private;
+ mi = ( monitor_info_t * )be->be_private;
- if ( monitor_cache_get( mi,
- &monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn,
- &e_backend ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
+ ms_database = monitor_back_get_subsys( SLAPD_MONITOR_DATABASE_NAME );
+ if ( ms_database == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
- "unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0, 0 );
-#else
+ "unable to get "
+ "\"" SLAPD_MONITOR_DATABASE_NAME "\" "
+ "subsystem\n",
+ 0, 0, 0 );
+ return -1;
+ }
+
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_backend ) )
+ {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
- "unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to get entry \"%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
- e_tmp = NULL;
- for ( i = nBackendInfo; i--; ) {
+ mp = ( monitor_entry_t * )e_backend->e_private;
+ mp->mp_children = NULL;
+ ep = &mp->mp_children;
+
+ for ( i = 0; i < nBackendInfo; i++ ) {
char buf[ BACKMONITOR_BUFSIZE ];
BackendInfo *bi;
struct berval bv;
int j;
+ Entry *e;
- bi = &backendInfo[i];
+ bi = &backendInfo[ i ];
snprintf( buf, sizeof( buf ),
"dn: cn=Backend %d,%s\n"
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Backend %d\n"
+ "creatorsName: %s\n"
+ "modifiersName: %s\n"
"createTimestamp: %s\n"
"modifyTimestamp: %s\n",
i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
+ ms->mss_dn.bv_val,
mi->mi_oc_monitoredObject->soc_cname.bv_val,
mi->mi_oc_monitoredObject->soc_cname.bv_val,
i,
+ mi->mi_creatorsName.bv_val,
+ mi->mi_creatorsName.bv_val,
mi->mi_startTime.bv_val,
mi->mi_startTime.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_backend_init: "
- "unable to create entry 'cn=Backend %d,%s'\n",
- i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
- "unable to create entry 'cn=Backend %d,%s'\n%s",
- i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
- "" );
-#endif
+ "unable to create entry \"cn=Backend %d,%s\"\n",
+ i, ms->mss_ndn.bv_val, 0 );
return( -1 );
}
}
for ( j = 0; j < nBackendDB; j++ ) {
- BackendDB *be = &backendDB[j];
+ BackendDB *be = &backendDB[ j ];
char buf[ SLAP_LDAPDN_MAXLEN ];
struct berval dn;
}
snprintf( buf, sizeof( buf ), "cn=Database %d,%s",
- j, monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val );
+ j, ms_database->mss_dn.bv_val );
dn.bv_val = buf;
dn.bv_len = strlen( buf );
&dn, NULL );
}
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_BACKEND];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_BACKEND].mss_flags
- | MONITOR_F_SUB;
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags | MONITOR_F_SUB;
if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_backend_init: "
- "unable to add entry 'cn=Backend %d,%s'\n",
- i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
- "unable to add entry 'cn=Backend %d,%s'\n%s",
+ "unable to add entry \"cn=Backend %d,%s\"\n",
i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
- "" );
-#endif
+ ms->mss_ndn.bv_val, 0 );
return( -1 );
}
- e_tmp = e;
+ *ep = e;
+ ep = &mp->mp_next;
}
- mp = ( struct monitorentrypriv * )e_backend->e_private;
- mp->mp_children = e_tmp;
-
monitor_cache_release( mi, e_backend );
return( 0 );