Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pool: Fix logging context for thread pool
Fixes the logging context in a thread pool used by migration tasks, pool to pool tasks, and sticky bit expiration. Target: trunk Request: 2.8 Request: 2.7 Request: 2.6 Acked-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Patch: http://rb.dcache.org/r/6675/ (cherry picked from commit 4f79cb3) Conflicts: modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml
- Loading branch information
Showing
3 changed files
with
79 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
modules/dcache/src/main/java/org/dcache/util/CDCScheduledExecutorServiceDecorator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* dCache - http://www.dcache.org/ | ||
* | ||
* Copyright (C) 2014 Deutsches Elektronen-Synchrotron | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
package org.dcache.util; | ||
|
||
import java.util.concurrent.Callable; | ||
import java.util.concurrent.ScheduledExecutorService; | ||
import java.util.concurrent.ScheduledFuture; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
public class CDCScheduledExecutorServiceDecorator | ||
extends CDCExecutorServiceDecorator | ||
implements ScheduledExecutorService | ||
{ | ||
public CDCScheduledExecutorServiceDecorator(ScheduledExecutorService delegate) | ||
{ | ||
super(delegate); | ||
} | ||
|
||
@Override | ||
protected ScheduledExecutorService delegate() | ||
{ | ||
return (ScheduledExecutorService) super.delegate(); | ||
} | ||
|
||
@Override | ||
public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) | ||
{ | ||
return delegate().schedule(wrap(command), delay, unit); | ||
} | ||
|
||
@Override | ||
public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) | ||
{ | ||
return delegate().schedule(wrap(callable), delay, unit); | ||
} | ||
|
||
@Override | ||
public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) | ||
{ | ||
return delegate().scheduleAtFixedRate(wrap(command), initialDelay, period, unit); | ||
} | ||
|
||
@Override | ||
public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) | ||
{ | ||
return delegate().scheduleWithFixedDelay(wrap(command), initialDelay, delay, unit); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters