Changeset 2439


Ignore:
Timestamp:
07/20/20 19:07:40 (4 years ago)
Author:
nanardon
Message:

Flag in log when change are made by SyncManager?

Location:
trunk/LATMOS-Accounts/lib/LATMOS
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts.pm

    r2428 r2439  
    7474 
    7575    $self->{_configdir} = $config; 
     76    $self->{_loguser} = $options{loguser}; 
    7677    bless($self, $class); 
    7778 
    78     unless ($options{noacl} || $ENV{LA_USERNAME}) { 
     79    unless ($options{noacl}) { 
    7980        if (-f (my $aclf = join('/', $self->_configdir, 'la-acls.ini'))) { 
    8081            $self->{_acls} = LATMOS::Accounts::Acls->new($aclf) or do { 
     
    147148    }; 
    148149    $base; 
     150} 
     151 
     152=head2 LogUser 
     153 
     154Return the username to use when no user is connected 
     155 
     156=cut 
     157 
     158sub LogUser { 
     159    my ( $self, $Login ) = @_; 
     160 
     161    my $name = $self->{_loguser} || '@Console'; 
     162 
     163    if ($Login) { 
     164        $self->{_loguser} = $Login; 
     165    } 
     166 
     167    return $name; 
    149168} 
    150169 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm

    r2430 r2439  
    12791279sub user { $_[0]->{_user} } 
    12801280 
     1281=head2 LogUser 
     1282 
     1283Return the username to use when no user is connected 
     1284 
     1285=cut 
     1286 
     1287sub LogUser { 
     1288    my ( $self ) = @_; 
     1289 
     1290    return $self->user || $self->la->LogUser; 
     1291} 
     1292 
    12811293=head2 check_acl($obj, $attr, $perm) 
    12821294 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

    r2413 r2439  
    10111011 
    10121012    $sthmodifiedby->execute( 
    1013         $self->user || '@Console', 
     1013        $self->LogUser, 
    10141014        $ref, 
    10151015    ); 
     
    10361036        $name, 
    10371037        $changetype, 
    1038         $self->user || '@Console', 
     1038        $self->LogUser, 
    10391039        sprintf($message, @args), 
    10401040        $potype, $pname, $pikey, 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

    r2435 r2439  
    394394    } 
    395395    $first{$class->_key_field} = $id; 
    396     $first{createdby} =  $base->user || '@Console'; 
    397     $first{modifiedby} = $base->user || '@Console'; 
     396    $first{createdby} =  $base->LogUser; 
     397    $first{modifiedby} = $base->LogUser; 
    398398 
    399399    my $lastid; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/SyncManager.pm

    r2220 r2439  
    6161sub ini { $_[0]->{ini} } 
    6262 
     63=head2 LA 
     64 
     65Return a LATMOS::Accounts setup for SynchM 
     66 
     67=cut 
     68 
     69sub LA { 
     70    my ( $self ) = @_; 
     71 
     72    return LATMOS::Accounts->new($self->{config}, noacl => 1, loguser => '@SyncManager'); 
     73} 
     74 
    6375=head2 dbrev 
    6476 
     
    6981sub dbrev { 
    7082    my ($self) = @_; 
    71     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     83    my $LA = $self->LA; 
    7284    my $base = $LA->base; 
    7385    return $base->current_rev; 
     
    7688sub _load_state_ini { 
    7789    my ($self) = @_; 
    78     my $la = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     90    my $la = $self->LA; 
    7991 
    8092    my $state_file =  $la->val('_default_', 'state_dir', '/'); 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task.pm

    r2246 r2439  
    3737} 
    3838 
     39sub LA { 
     40    my $self = shift; 
     41 
     42    return $self->{syncm}->LA(@_); 
     43} 
     44 
    3945=head2 config($value, $default) 
    4046 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Basessynchro.pm

    r2127 r2439  
    2323sub run { 
    2424    my ($self) = @_; 
    25     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1) or do { 
     25    my $LA = $self->LA; 
    2626        la_log LA_ERR, "Cannot instantiate LA"; 
    2727        return 1; 
     
    5555sub reset_savepoint { 
    5656    my ($self) = @_; 
    57     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1) or do { 
     57    my $LA = $self->LA; 
    5858        la_log LA_ERR, "Cannot instantiate LA"; 
    5959        return; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildlistes.pm

    r2332 r2439  
    2525sub init { 
    2626    my ($self) = @_; 
    27     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     27    my $LA = $self->LA; 
    2828    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    2929    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm

    r2392 r2439  
    5353sub init { 
    5454    my ($self) = @_; 
    55     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     55    my $LA = $self->LA; 
    5656 
    5757    $self->{_base} = $LA->base(); 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm

    r2029 r2439  
    9898sub init { 
    9999    my ($self) = @_; 
    100     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     100    my $LA = $self->LA; 
    101101    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    102102    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Employment.pm

    r2378 r2439  
    2323sub init { 
    2424    my ($self) = @_; 
    25     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     25    my $LA = $self->LA; 
    2626    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    2727    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Expiredaliases.pm

    r1943 r2439  
    2525sub init { 
    2626    my ($self) = @_; 
    27     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     27    my $LA = $self->LA; 
    2828    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    2929    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Iprecover.pm

    r2024 r2439  
    4545sub init { 
    4646    my ($self) = @_; 
    47     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     47    my $LA = $self->LA; 
    4848    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    4949    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Refreshexpired.pm

    r1828 r2439  
    3535sub init { 
    3636    my ($self) = @_; 
    37     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     37    my $LA = $self->LA; 
    3838    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    3939    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Setattribute.pm

    r2257 r2439  
    4949sub init { 
    5050    my ($self) = @_; 
    51     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     51    my $LA = $self->LA; 
    5252    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    5353    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Stats.pm

    r2016 r2439  
    1818sub init { 
    1919    my ($self) = @_; 
    20     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     20    my $LA = $self->LA; 
    2121    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    2222    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Unexportexpired.pm

    r1880 r2439  
    3232sub init { 
    3333    my ($self) = @_; 
    34     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     34    my $LA = $self->LA; 
    3535    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    3636    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Unusedhosts.pm

    r2024 r2439  
    5555sub init { 
    5656    my ($self) = @_; 
    57     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     57    my $LA = $self->LA; 
    5858    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    5959    $labase && $labase->load or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Update.pm

    r2376 r2439  
    2222sub init { 
    2323    my ($self) = @_; 
    24     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     24    my $LA = $self->LA; 
    2525    my $basename = $LA->default_base_name; 
    2626    my $labase = $LA->_load_base($basename) or die "Cannot load base"; 
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Updatedyndata.pm

    r2376 r2439  
    3131sub init { 
    3232    my ($self) = @_; 
    33     my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1); 
     33    my $LA = $self->LA; 
    3434    my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 
    3535    $labase && $labase->load or die "Cannot load base"; 
Note: See TracChangeset for help on using the changeset viewer.